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

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

Issue 8949006: [uber page] Remove extensions sub-page from options2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_piece.h" 14 #include "base/string_piece.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
17 #include "base/time.h" 17 #include "base/time.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/browser/browser_about_handler.h" 19 #include "chrome/browser/browser_about_handler.h"
20 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/webui/options2/advanced_options_handler.h" 22 #include "chrome/browser/ui/webui/options2/advanced_options_handler.h"
23 #include "chrome/browser/ui/webui/options2/autofill_options_handler.h" 23 #include "chrome/browser/ui/webui/options2/autofill_options_handler.h"
24 #include "chrome/browser/ui/webui/options2/browser_options_handler.h" 24 #include "chrome/browser/ui/webui/options2/browser_options_handler.h"
25 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h" 25 #include "chrome/browser/ui/webui/options2/clear_browser_data_handler.h"
26 #include "chrome/browser/ui/webui/options2/content_settings_handler.h" 26 #include "chrome/browser/ui/webui/options2/content_settings_handler.h"
27 #include "chrome/browser/ui/webui/options2/cookies_view_handler.h" 27 #include "chrome/browser/ui/webui/options2/cookies_view_handler.h"
28 #include "chrome/browser/ui/webui/options2/core_options_handler.h" 28 #include "chrome/browser/ui/webui/options2/core_options_handler.h"
29 #include "chrome/browser/ui/webui/options2/extension_settings_handler.h"
30 #include "chrome/browser/ui/webui/options2/font_settings_handler.h" 29 #include "chrome/browser/ui/webui/options2/font_settings_handler.h"
31 #include "chrome/browser/ui/webui/options2/handler_options_handler.h" 30 #include "chrome/browser/ui/webui/options2/handler_options_handler.h"
32 #include "chrome/browser/ui/webui/options2/import_data_handler.h" 31 #include "chrome/browser/ui/webui/options2/import_data_handler.h"
33 #include "chrome/browser/ui/webui/options2/language_options_handler.h" 32 #include "chrome/browser/ui/webui/options2/language_options_handler.h"
34 #include "chrome/browser/ui/webui/options2/manage_profile_handler.h" 33 #include "chrome/browser/ui/webui/options2/manage_profile_handler.h"
35 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h" 34 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
36 #include "chrome/browser/ui/webui/options2/pack_extension_handler.h"
37 #include "chrome/browser/ui/webui/options2/password_manager_handler.h" 35 #include "chrome/browser/ui/webui/options2/password_manager_handler.h"
38 #include "chrome/browser/ui/webui/options2/personal_options_handler.h" 36 #include "chrome/browser/ui/webui/options2/personal_options_handler.h"
39 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h" 37 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler.h"
40 #include "chrome/browser/ui/webui/options2/stop_syncing_handler.h" 38 #include "chrome/browser/ui/webui/options2/stop_syncing_handler.h"
41 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h" 39 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler.h"
42 #include "chrome/browser/ui/webui/theme_source.h" 40 #include "chrome/browser/ui/webui/theme_source.h"
43 #include "chrome/common/jstemplate_builder.h" 41 #include "chrome/common/jstemplate_builder.h"
44 #include "chrome/common/time_format.h" 42 #include "chrome/common/time_format.h"
45 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
46 #include "content/browser/renderer_host/render_view_host.h" 44 #include "content/browser/renderer_host/render_view_host.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 #endif 204 #endif
207 core_handler->set_handlers_host(this); 205 core_handler->set_handlers_host(this);
208 AddOptionsPageUIHandler(localized_strings, core_handler); 206 AddOptionsPageUIHandler(localized_strings, core_handler);
209 207
210 AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler()); 208 AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler());
211 AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler()); 209 AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler());
212 AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler()); 210 AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler());
213 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler()); 211 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
214 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); 212 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
215 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler()); 213 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
216 AddOptionsPageUIHandler(localized_strings, new ExtensionSettingsHandler());
217 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); 214 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
218 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler()); 215 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
219 #if defined(OS_CHROMEOS) 216 #if defined(OS_CHROMEOS)
220 AddOptionsPageUIHandler(localized_strings, 217 AddOptionsPageUIHandler(localized_strings,
221 new chromeos::CrosLanguageOptionsHandler()); 218 new chromeos::CrosLanguageOptionsHandler());
222 #else 219 #else
223 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 220 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
224 #endif 221 #endif
225 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 222 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
226 AddOptionsPageUIHandler(localized_strings, new PackExtensionHandler());
227 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 223 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
228 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler()); 224 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());
229 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 225 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
230 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 226 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
231 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler()); 227 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
232 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( 228 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
233 g_browser_process->profile_manager())); 229 g_browser_process->profile_manager()));
234 #if defined(OS_CHROMEOS) 230 #if defined(OS_CHROMEOS)
235 AddOptionsPageUIHandler(localized_strings, 231 AddOptionsPageUIHandler(localized_strings,
236 new chromeos::AboutPageHandler()); 232 new chromeos::AboutPageHandler());
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 #if defined(OS_WIN) 355 #if defined(OS_WIN)
360 command_line_string = 356 command_line_string =
361 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 357 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
362 #else 358 #else
363 command_line_string = 359 command_line_string =
364 CommandLine::ForCurrentProcess()->GetCommandLineString(); 360 CommandLine::ForCurrentProcess()->GetCommandLineString();
365 #endif 361 #endif
366 362
367 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 363 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
368 } 364 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698