wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 863375 - Remove 'Toggle Profiling' menu. r=ehsan

Browse Source 
--HG--
extra : rebase_source : c8e70c998ede7986e2583f3fba4d23fcdb37b540
This commit is contained in:
Benoit Girard 2013-04-19 15:37:50 -04:00
parent fe1d36992b
commit 3d7c532eec
8 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/AppConstants.java.in
View File

@ -52,13 +52,6 @@ public class AppConstants {
null;
#endif
public static final boolean MOZ_PROFILING =
#ifdef MOZ_PROFILING
true;
#else
false;
#endif
public static final boolean MOZ_TELEMETRY_ON_BY_DEFAULT =
#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
true;

9
mobile/android/base/BrowserApp.java
View File

@ -1513,10 +1513,6 @@ abstract public class BrowserApp extends GeckoApp
// In ICS+, it's easy to kill an app through the task switcher.
aMenu.findItem(R.id.quit).setVisible(Build.VERSION.SDK_INT < 14 || HardwareUtils.isTelevision());
if (AppConstants.MOZ_PROFILING) {
aMenu.findItem(R.id.toggle_profiling).setVisible(true);
}
if (tab == null || tab.getURL() == null) {
bookmark.setEnabled(false);
forward.setEnabled(false);
@ -1561,11 +1557,6 @@ abstract public class BrowserApp extends GeckoApp
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.toggle_profiling) {
GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
return true;
}
Tab tab = null;
Intent intent = null;
switch (item.getItemId()) {

4
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
View File

@ -71,8 +71,4 @@
<item android:id="@+id/settings"
android:icon="@drawable/ic_menu_settings"
android:title="@string/settings" />
<item android:id="@+id/toggle_profiling"
android:visible="false"
android:title="@string/toggle_profiling" />
</menu>

4
mobile/android/base/resources/menu-v11/browser_app_menu.xml
View File

@ -72,8 +72,4 @@
<item android:id="@+id/settings"
android:icon="@drawable/ic_menu_settings"
android:title="@string/settings" />
<item android:id="@+id/toggle_profiling"
android:visible="false"
android:title="@string/toggle_profiling" />
</menu>

4
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
View File

@ -72,8 +72,4 @@
<item android:id="@+id/settings"
android:icon="@drawable/ic_menu_settings"
android:title="@string/settings" />
<item android:id="@+id/toggle_profiling"
android:visible="false"
android:title="@string/toggle_profiling" />
</menu>

4
mobile/android/base/resources/menu/browser_app_menu.xml
View File

@ -53,8 +53,4 @@
<item android:id="@+id/settings"
android:title="@string/settings" />
<item android:id="@+id/toggle_profiling"
android:visible="false"
android:title="@string/toggle_profiling" />
</menu>

3
mobile/android/base/strings.xml.in
View File

@ -145,9 +145,6 @@
<string name="tabs_normal">&tabs_normal;</string>
<string name="tabs_private">&tabs_private;</string>
<string name="tabs_synced">&tabs_synced;</string>
<!-- This string only appears in developer builds, which
is why it is not localizable. -->
<string name="toggle_profiling">Toggle Profiling</string>
<string name="site_settings_title">&site_settings_title2;</string>
<string name="site_settings_cancel">&site_settings_cancel;</string>

12
mobile/android/chrome/content/browser.js
View File

@ -252,7 +252,6 @@ var BrowserApp = {
Services.obs.addObserver(this, "Viewport:FixedMarginsChanged", false);
Services.obs.addObserver(this, "Passwords:Init", false);
Services.obs.addObserver(this, "FormHistory:Init", false);
Services.obs.addObserver(this, "ToggleProfiling", false);
Services.obs.addObserver(this, "gather-telemetry", false);
Services.obs.addObserver(this, "keyword-search", false);
@ -1321,17 +1320,6 @@ var BrowserApp = {
sendMessageToJava({ type: "Session:StatePurged" });
break;
case "ToggleProfiling": {
let profiler = Cc["@mozilla.org/tools/profiler;1"].
getService(Ci.nsIProfiler);
if (profiler.IsActive()) {
profiler.StopProfiler();
} else {
profiler.StartProfiler(100000, 25, ["stackwalk"], 1);
}
break;
}
case "gather-telemetry":
sendMessageToJava({ type: "Telemetry:Gather" });
break;