Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4557)

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/preferences/PreferencesStaging.java

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java_staging/src/org/chromium/chrome/browser/preferences/PreferencesStaging.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/preferences/PreferencesStaging.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/preferences/PreferencesStaging.java
new file mode 100644
index 0000000000000000000000000000000000000000..1192942eb19c4a69330809ae16e63111625b9f56
--- /dev/null
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/preferences/PreferencesStaging.java
@@ -0,0 +1,84 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.preferences;
+
+import android.view.MenuItem;
+
+import com.google.android.apps.chrome.R;
+
+import org.chromium.base.library_loader.ProcessInitException;
+import org.chromium.chrome.browser.ChromiumApplication;
+import org.chromium.chrome.browser.EmbedContentViewActivity;
+import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
+import org.chromium.chrome.browser.contextualsearch.ContextualSearchUma;
+import org.chromium.chrome.browser.help.HelpAndFeedback;
+import org.chromium.chrome.browser.precache.PrecacheLauncher;
+import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
+
+/**
+ * The staging bits of the Chrome settings activity.
+ *
+ * TODO(newt): merge this with Preferences after upstreaming.
+ */
+public class PreferencesStaging extends Preferences {
+
+ @Override
+ protected void startBrowserProcessSync() throws ProcessInitException {
+ ((ChromiumApplication) getApplication())
+ .startBrowserProcessesAndLoadLibrariesSync(this, true);
+ }
+
+ @Override
+ protected String getTopLevelFragmentName() {
+ return MainPreferences.class.getName();
+ }
+
+ @Override
+ public void showUrl(int titleResId, int urlResId) {
+ EmbedContentViewActivity.show(this, titleResId, urlResId);
+ }
+
+ @Override
+ public void showGoogleTranslateHelp() {
+ HelpAndFeedback.getInstance(this).show(this, HelpAndFeedback.CONTEXT_TRANSLATE, null, null);
+ }
+
+ @Override
+ public void logContextualSearchToggled(boolean newValue) {
+ ContextualSearchUma.logPreferenceChange(newValue);
+ }
+
+ @Override
+ public boolean isContextualSearchEnabled() {
+ return ContextualSearchFieldTrial.isEnabled(this);
+ }
+
+ @Override
+ public void updatePrecachingEnabled() {
+ PrecacheLauncher.updatePrecachingEnabled(PrivacyPreferencesManager.getInstance(this), this);
+ }
+
+ @Override
+ public void showPrivacyPreferencesHelp() {
+ HelpAndFeedback.getInstance(this).show(this, HelpAndFeedback.CONTEXT_PRIVACY, null, null);
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ ChromiumApplication.flushPersistentData();
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == R.id.menu_id_help_general) {
+ HelpAndFeedback.getInstance(this).show(this, HelpAndFeedback.CONTEXT_SETTINGS, null,
+ null);
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+}

Powered by Google App Engine
This is Rietveld 408576698