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

Side by Side Diff: chrome/browser/ui/webui/options2/options_ui2.cc

Issue 9181013: [uber page] Migrate remaining Personal options into Browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: How about another rebase! (damn you generated_resources.grd) Created 8 years, 11 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/options2/options_ui2.h" 5 #include "chrome/browser/ui/webui/options2/options_ui2.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 15 matching lines...) Expand all
26 #include "chrome/browser/ui/webui/options2/content_settings_handler2.h" 26 #include "chrome/browser/ui/webui/options2/content_settings_handler2.h"
27 #include "chrome/browser/ui/webui/options2/cookies_view_handler2.h" 27 #include "chrome/browser/ui/webui/options2/cookies_view_handler2.h"
28 #include "chrome/browser/ui/webui/options2/core_options_handler2.h" 28 #include "chrome/browser/ui/webui/options2/core_options_handler2.h"
29 #include "chrome/browser/ui/webui/options2/font_settings_handler2.h" 29 #include "chrome/browser/ui/webui/options2/font_settings_handler2.h"
30 #include "chrome/browser/ui/webui/options2/handler_options_handler2.h" 30 #include "chrome/browser/ui/webui/options2/handler_options_handler2.h"
31 #include "chrome/browser/ui/webui/options2/import_data_handler2.h" 31 #include "chrome/browser/ui/webui/options2/import_data_handler2.h"
32 #include "chrome/browser/ui/webui/options2/language_options_handler2.h" 32 #include "chrome/browser/ui/webui/options2/language_options_handler2.h"
33 #include "chrome/browser/ui/webui/options2/manage_profile_handler2.h" 33 #include "chrome/browser/ui/webui/options2/manage_profile_handler2.h"
34 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler2.h" 34 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler2.h"
35 #include "chrome/browser/ui/webui/options2/password_manager_handler2.h" 35 #include "chrome/browser/ui/webui/options2/password_manager_handler2.h"
36 #include "chrome/browser/ui/webui/options2/personal_options_handler2.h"
37 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h" 36 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h"
38 #include "chrome/browser/ui/webui/options2/startup_pages_handler2.h" 37 #include "chrome/browser/ui/webui/options2/startup_pages_handler2.h"
39 #include "chrome/browser/ui/webui/options2/stop_syncing_handler2.h" 38 #include "chrome/browser/ui/webui/options2/stop_syncing_handler2.h"
40 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h" 39 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h"
41 #include "chrome/browser/ui/webui/theme_source.h" 40 #include "chrome/browser/ui/webui/theme_source.h"
42 #include "chrome/common/jstemplate_builder.h" 41 #include "chrome/common/jstemplate_builder.h"
43 #include "chrome/common/time_format.h" 42 #include "chrome/common/time_format.h"
44 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
45 #include "content/browser/renderer_host/render_view_host.h" 44 #include "content/browser/renderer_host/render_view_host.h"
46 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); 218 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
220 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler()); 219 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
221 #if defined(OS_CHROMEOS) 220 #if defined(OS_CHROMEOS)
222 AddOptionsPageUIHandler(localized_strings, 221 AddOptionsPageUIHandler(localized_strings,
223 new chromeos::options2::CrosLanguageOptionsHandler()); 222 new chromeos::options2::CrosLanguageOptionsHandler());
224 #else 223 #else
225 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 224 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
226 #endif 225 #endif
227 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 226 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
228 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 227 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
229 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());
230 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 228 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
231 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 229 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
232 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 230 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
233 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler()); 231 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
234 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( 232 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
235 g_browser_process->profile_manager())); 233 g_browser_process->profile_manager()));
236 #if defined(OS_CHROMEOS) 234 #if defined(OS_CHROMEOS)
237 AddOptionsPageUIHandler(localized_strings, 235 AddOptionsPageUIHandler(localized_strings,
238 new chromeos::options2::AccountsOptionsHandler()); 236 new chromeos::options2::AccountsOptionsHandler());
239 AddOptionsPageUIHandler(localized_strings, 237 AddOptionsPageUIHandler(localized_strings,
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 364 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
367 #else 365 #else
368 command_line_string = 366 command_line_string =
369 CommandLine::ForCurrentProcess()->GetCommandLineString(); 367 CommandLine::ForCurrentProcess()->GetCommandLineString();
370 #endif 368 #endif
371 369
372 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 370 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
373 } 371 }
374 372
375 } // namespace options2 373 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698