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

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

Issue 247663003: Date and Time dialog for when the clock isn't synced. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, single quotes in browsertest js Created 6 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/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/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "ui/base/webui/web_ui_util.h" 68 #include "ui/base/webui/web_ui_util.h"
69 #include "url/gurl.h" 69 #include "url/gurl.h"
70 70
71 #if defined(OS_CHROMEOS) 71 #if defined(OS_CHROMEOS)
72 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 72 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
73 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 73 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
74 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 74 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
75 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 75 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
76 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 76 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
77 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 77 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
78 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h"
78 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 79 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
79 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" 80 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
80 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 81 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
81 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 82 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
82 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" 83 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
83 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 84 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
84 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" 85 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
85 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 86 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
86 #endif 87 #endif
87 88
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 293 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
293 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); 294 AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler());
294 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler( 295 AddOptionsPageUIHandler(localized_strings, new SyncSetupHandler(
295 g_browser_process->profile_manager())); 296 g_browser_process->profile_manager()));
296 #if defined(OS_CHROMEOS) 297 #if defined(OS_CHROMEOS)
297 AddOptionsPageUIHandler(localized_strings, 298 AddOptionsPageUIHandler(localized_strings,
298 new chromeos::options::AccountsOptionsHandler()); 299 new chromeos::options::AccountsOptionsHandler());
299 AddOptionsPageUIHandler(localized_strings, 300 AddOptionsPageUIHandler(localized_strings,
300 new chromeos::options::BluetoothOptionsHandler()); 301 new chromeos::options::BluetoothOptionsHandler());
301 AddOptionsPageUIHandler(localized_strings, 302 AddOptionsPageUIHandler(localized_strings,
303 new chromeos::options::DateTimeOptionsHandler());
304 AddOptionsPageUIHandler(localized_strings,
302 new chromeos::options::DisplayOptionsHandler()); 305 new chromeos::options::DisplayOptionsHandler());
303 AddOptionsPageUIHandler(localized_strings, 306 AddOptionsPageUIHandler(localized_strings,
304 new chromeos::options::DisplayOverscanHandler()); 307 new chromeos::options::DisplayOverscanHandler());
305 AddOptionsPageUIHandler(localized_strings, 308 AddOptionsPageUIHandler(localized_strings,
306 new chromeos::options::InternetOptionsHandler()); 309 new chromeos::options::InternetOptionsHandler());
307 AddOptionsPageUIHandler(localized_strings, 310 AddOptionsPageUIHandler(localized_strings,
308 new chromeos::options::KeyboardHandler()); 311 new chromeos::options::KeyboardHandler());
309 312
310 chromeos::options::PointerHandler* pointer_handler = 313 chromeos::options::PointerHandler* pointer_handler =
311 new chromeos::options::PointerHandler(); 314 new chromeos::options::PointerHandler();
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 // Add only if handler's service is enabled. 450 // Add only if handler's service is enabled.
448 if (handler->IsEnabled()) { 451 if (handler->IsEnabled()) {
449 // Add handler to the list and also pass the ownership. 452 // Add handler to the list and also pass the ownership.
450 web_ui()->AddMessageHandler(handler.release()); 453 web_ui()->AddMessageHandler(handler.release());
451 handler_raw->GetLocalizedValues(localized_strings); 454 handler_raw->GetLocalizedValues(localized_strings);
452 handlers_.push_back(handler_raw); 455 handlers_.push_back(handler_raw);
453 } 456 }
454 } 457 }
455 458
456 } // namespace options 459 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/date_time_options_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698