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

Side by Side Diff: chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

Issue 17010003: Cleanup of system settings constants (ab)use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
6 6
7 #include "base/memory/ref_counted_memory.h" 7 #include "base/memory/ref_counted_memory.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/system/statistics_provider.h" 10 #include "chrome/browser/chromeos/system/statistics_provider.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 core_handler_->set_handlers_host(this); 95 core_handler_->set_handlers_host(this);
96 core_handler_->GetLocalizedValues(localized_strings); 96 core_handler_->GetLocalizedValues(localized_strings);
97 web_ui->AddMessageHandler(core_handler_); 97 web_ui->AddMessageHandler(core_handler_);
98 98
99 proxy_handler_->GetLocalizedValues(localized_strings); 99 proxy_handler_->GetLocalizedValues(localized_strings);
100 web_ui->AddMessageHandler(proxy_handler_); 100 web_ui->AddMessageHandler(proxy_handler_);
101 101
102 bool keyboard_driven_oobe = false; 102 bool keyboard_driven_oobe = false;
103 system::StatisticsProvider::GetInstance()->GetMachineFlag( 103 system::StatisticsProvider::GetInstance()->GetMachineFlag(
104 chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); 104 chromeos::system::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe);
105 localized_strings->SetString("highlightStrength", 105 localized_strings->SetString("highlightStrength",
106 keyboard_driven_oobe ? "strong" : "normal"); 106 keyboard_driven_oobe ? "strong" : "normal");
107 107
108 ProxySettingsHTMLSource* source = 108 ProxySettingsHTMLSource* source =
109 new ProxySettingsHTMLSource(localized_strings); 109 new ProxySettingsHTMLSource(localized_strings);
110 Profile* profile = Profile::FromWebUI(web_ui); 110 Profile* profile = Profile::FromWebUI(web_ui);
111 content::URLDataSource::Add(profile, source); 111 content::URLDataSource::Add(profile, source);
112 } 112 }
113 113
114 ProxySettingsUI::~ProxySettingsUI() { 114 ProxySettingsUI::~ProxySettingsUI() {
(...skipping 10 matching lines...) Expand all
125 if (!initialized_handlers_) { 125 if (!initialized_handlers_) {
126 core_handler_->InitializeHandler(); 126 core_handler_->InitializeHandler();
127 proxy_handler_->InitializeHandler(); 127 proxy_handler_->InitializeHandler();
128 initialized_handlers_ = true; 128 initialized_handlers_ = true;
129 } 129 }
130 core_handler_->InitializePage(); 130 core_handler_->InitializePage();
131 proxy_handler_->InitializePage(); 131 proxy_handler_->InitializePage();
132 } 132 }
133 133
134 } // namespace chromeos 134 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chrome/browser/ui/webui/options/chromeos/proxy_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698