chrome/browser/ui/webui/options/options_ui.cc - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' 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

« chrome/browser/chromeos/proxy_config_service_impl.cc ('K') | « chrome/browser/ui/webui/options/core_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
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 234 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
245 AddOptionsPageUIHandler(localized_strings,	245 AddOptionsPageUIHandler(localized_strings,

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, new chromeos::ProxyHandler());	255 AddOptionsPageUIHandler(localized_strings,

	256 new chromeos::ProxyHandler(GetProfile()));

256 AddOptionsPageUIHandler(localized_strings,	257 AddOptionsPageUIHandler(localized_strings,

257 new chromeos::ChangePictureOptionsHandler());	258 new chromeos::ChangePictureOptionsHandler());

258 AddOptionsPageUIHandler(localized_strings,	259 AddOptionsPageUIHandler(localized_strings,

259 new chromeos::StatsOptionsHandler());	260 new chromeos::StatsOptionsHandler());

260 AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler());	261 AddOptionsPageUIHandler(localized_strings, new SystemOptionsHandler());

261 #endif	262 #endif

262 #if defined(USE_NSS)	263 #if defined(USE_NSS)

263 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());	264 AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());

264 #endif	265 #endif

265 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());	266 AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
359 #if defined(OS_WIN)	360 #if defined(OS_WIN)

360 command_line_string =	361 command_line_string =

361 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());	362 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());

362 #else	363 #else

363 command_line_string =	364 command_line_string =

364 CommandLine::ForCurrentProcess()->GetCommandLineString();	365 CommandLine::ForCurrentProcess()->GetCommandLineString();

365 #endif	366 #endif

366	367

367 render_view_host->SetWebUIProperty("commandLineString", command_line_string);	368 render_view_host->SetWebUIProperty("commandLineString", command_line_string);

368 }	369 }

OLD	NEW