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

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

Issue 10211010: Sync UI: Remove the StopSyncingHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes. Created 8 years, 8 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 20 matching lines...) Expand all
31 #include "chrome/browser/ui/webui/options2/font_settings_handler2.h" 31 #include "chrome/browser/ui/webui/options2/font_settings_handler2.h"
32 #include "chrome/browser/ui/webui/options2/handler_options_handler2.h" 32 #include "chrome/browser/ui/webui/options2/handler_options_handler2.h"
33 #include "chrome/browser/ui/webui/options2/home_page_overlay_handler2.h" 33 #include "chrome/browser/ui/webui/options2/home_page_overlay_handler2.h"
34 #include "chrome/browser/ui/webui/options2/import_data_handler2.h" 34 #include "chrome/browser/ui/webui/options2/import_data_handler2.h"
35 #include "chrome/browser/ui/webui/options2/language_options_handler2.h" 35 #include "chrome/browser/ui/webui/options2/language_options_handler2.h"
36 #include "chrome/browser/ui/webui/options2/manage_profile_handler2.h" 36 #include "chrome/browser/ui/webui/options2/manage_profile_handler2.h"
37 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h" 37 #include "chrome/browser/ui/webui/options2/options_sync_setup_handler.h"
38 #include "chrome/browser/ui/webui/options2/password_manager_handler2.h" 38 #include "chrome/browser/ui/webui/options2/password_manager_handler2.h"
39 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h" 39 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h"
40 #include "chrome/browser/ui/webui/options2/startup_pages_handler2.h" 40 #include "chrome/browser/ui/webui/options2/startup_pages_handler2.h"
41 #include "chrome/browser/ui/webui/options2/stop_syncing_handler.h"
42 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h" 41 #include "chrome/browser/ui/webui/options2/web_intents_settings_handler2.h"
43 #include "chrome/browser/ui/webui/theme_source.h" 42 #include "chrome/browser/ui/webui/theme_source.h"
44 #include "chrome/common/jstemplate_builder.h" 43 #include "chrome/common/jstemplate_builder.h"
45 #include "chrome/common/time_format.h" 44 #include "chrome/common/time_format.h"
46 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
47 #include "content/public/browser/browser_thread.h" 46 #include "content/public/browser/browser_thread.h"
48 #include "content/public/browser/notification_types.h" 47 #include "content/public/browser/notification_types.h"
49 #include "content/public/browser/render_view_host.h" 48 #include "content/public/browser/render_view_host.h"
50 #include "content/public/browser/web_contents.h" 49 #include "content/public/browser/web_contents.h"
51 #include "content/public/browser/web_contents_delegate.h" 50 #include "content/public/browser/web_contents_delegate.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 AddOptionsPageUIHandler(localized_strings, 238 AddOptionsPageUIHandler(localized_strings,
240 new chromeos::options2::CrosLanguageOptionsHandler()); 239 new chromeos::options2::CrosLanguageOptionsHandler());
241 #else 240 #else
242 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 241 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
243 #endif 242 #endif
244 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 243 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
245 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 244 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
246 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 245 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
247 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 246 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
248 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 247 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
249 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
250 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( 248 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
251 g_browser_process->profile_manager())); 249 g_browser_process->profile_manager()));
252 #if defined(OS_CHROMEOS) 250 #if defined(OS_CHROMEOS)
253 AddOptionsPageUIHandler(localized_strings, 251 AddOptionsPageUIHandler(localized_strings,
254 new chromeos::options2::AccountsOptionsHandler()); 252 new chromeos::options2::AccountsOptionsHandler());
255 AddOptionsPageUIHandler(localized_strings, 253 AddOptionsPageUIHandler(localized_strings,
256 new chromeos::options2::BluetoothOptionsHandler()); 254 new chromeos::options2::BluetoothOptionsHandler());
257 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); 255 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
258 AddOptionsPageUIHandler(localized_strings, 256 AddOptionsPageUIHandler(localized_strings,
259 new chromeos::options2::LanguageChewingHandler()); 257 new chromeos::options2::LanguageChewingHandler());
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 418 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
421 #else 419 #else
422 command_line_string = 420 command_line_string =
423 CommandLine::ForCurrentProcess()->GetCommandLineString(); 421 CommandLine::ForCurrentProcess()->GetCommandLineString();
424 #endif 422 #endif
425 423
426 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 424 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
427 } 425 }
428 426
429 } // namespace options2 427 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/resources/sync_setup_overlay.js ('k') | chrome/browser/ui/webui/options2/stop_syncing_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698