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

Unified Diff: chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc

Issue 10692141: Fix the issue that Flash-related options are not showed on Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: sync Created 8 years, 5 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
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc
index 4bfacd9c3d7260d2a131648485e9541281628c57..86d266f8346214031fefe2b251b7e52f3fa490a6 100644
--- a/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc
@@ -114,6 +114,8 @@ CoreChromeOSOptionsHandler::~CoreChromeOSOptionsHandler() {
}
void CoreChromeOSOptionsHandler::InitializeHandler() {
+ CoreOptionsHandler::InitializeHandler();
+
proxy_prefs_.reset(PrefSetObserver::CreateProxyPrefSetObserver(
Profile::FromWebUI(web_ui())->GetPrefs(), this));
// Observe the chromeos::ProxyConfigServiceImpl for changes from the UI.
@@ -124,11 +126,6 @@ void CoreChromeOSOptionsHandler::InitializeHandler() {
pointer_factory_.GetWeakPtr()));
}
-void CoreChromeOSOptionsHandler::InitializePage() {
- // NOTE: Don't remove this, we're intentionally ignoring the base class'
- // implementation of InitializePage.
-}
-
base::Value* CoreChromeOSOptionsHandler::FetchPref(
const std::string& pref_name) {
if (proxy_cros_settings_parser::IsProxyPref(pref_name)) {
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698