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

Side by Side Diff: chrome/browser/ui/webui/options/options_ui.cc

Issue 8467012: Refactor proxy handling for ChromeOS to not go through the CrosSettings interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Centralized the proxy change notification. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 new chromeos::LanguageCustomizeModifierKeysHandler()); 246 new chromeos::LanguageCustomizeModifierKeysHandler());
247 AddOptionsPageUIHandler(localized_strings, 247 AddOptionsPageUIHandler(localized_strings,
248 new chromeos::LanguageHangulHandler()); 248 new chromeos::LanguageHangulHandler());
249 AddOptionsPageUIHandler(localized_strings, 249 AddOptionsPageUIHandler(localized_strings,
250 new chromeos::LanguageMozcHandler()); 250 new chromeos::LanguageMozcHandler());
251 AddOptionsPageUIHandler(localized_strings, 251 AddOptionsPageUIHandler(localized_strings,
252 new chromeos::LanguagePinyinHandler()); 252 new chromeos::LanguagePinyinHandler());
253 AddOptionsPageUIHandler(localized_strings, 253 AddOptionsPageUIHandler(localized_strings,
254 new chromeos::VirtualKeyboardManagerHandler()); 254 new chromeos::VirtualKeyboardManagerHandler());
255 AddOptionsPageUIHandler(localized_strings, 255 AddOptionsPageUIHandler(localized_strings,
256 new chromeos::ProxyHandler(GetProfile())); 256 new chromeos::ProxyHandler());
257 AddOptionsPageUIHandler(localized_strings, 257 AddOptionsPageUIHandler(localized_strings,
258 new chromeos::ChangePictureOptionsHandler()); 258 new chromeos::ChangePictureOptionsHandler());
259 AddOptionsPageUIHandler(localized_strings, 259 AddOptionsPageUIHandler(localized_strings,
260 new chromeos::StatsOptionsHandler()); 260 new chromeos::StatsOptionsHandler());
261 AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler()); 261 AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler());
262 #endif 262 #endif
263 #if defined(USE_NSS) 263 #if defined(USE_NSS)
264 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler()); 264 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());
265 #endif 265 #endif
266 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler()); 266 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 #if defined(OS_WIN) 360 #if defined(OS_WIN)
361 command_line_string = 361 command_line_string =
362 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 362 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
363 #else 363 #else
364 command_line_string = 364 command_line_string =
365 CommandLine::ForCurrentProcess()->GetCommandLineString(); 365 CommandLine::ForCurrentProcess()->GetCommandLineString();
366 #endif 366 #endif
367 367
368 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 368 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
369 } 369 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698