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

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

Issue 677983004: Power overlay in Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 86 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
87 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h " 87 #include "chrome/browser/ui/webui/options/chromeos/consumer_management_handler.h "
88 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 88 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
89 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 89 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
90 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h" 90 #include "chrome/browser/ui/webui/options/chromeos/date_time_options_handler.h"
91 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 91 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
92 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" 92 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
93 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 93 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
94 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 94 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
95 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" 95 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
96 #include "chrome/browser/ui/webui/options/chromeos/power_handler.h"
96 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 97 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
97 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" 98 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
98 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 99 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
99 #endif 100 #endif
100 101
101 #if defined(USE_NSS) 102 #if defined(USE_NSS)
102 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" 103 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
103 #endif 104 #endif
104 105
105 #if defined(ENABLE_GOOGLE_NOW) 106 #if defined(ENABLE_GOOGLE_NOW)
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 AddOptionsPageUIHandler(localized_strings, 320 AddOptionsPageUIHandler(localized_strings,
320 new chromeos::options::DateTimeOptionsHandler()); 321 new chromeos::options::DateTimeOptionsHandler());
321 AddOptionsPageUIHandler(localized_strings, 322 AddOptionsPageUIHandler(localized_strings,
322 new chromeos::options::DisplayOptionsHandler()); 323 new chromeos::options::DisplayOptionsHandler());
323 AddOptionsPageUIHandler(localized_strings, 324 AddOptionsPageUIHandler(localized_strings,
324 new chromeos::options::DisplayOverscanHandler()); 325 new chromeos::options::DisplayOverscanHandler());
325 AddOptionsPageUIHandler(localized_strings, 326 AddOptionsPageUIHandler(localized_strings,
326 new chromeos::options::InternetOptionsHandler()); 327 new chromeos::options::InternetOptionsHandler());
327 AddOptionsPageUIHandler(localized_strings, 328 AddOptionsPageUIHandler(localized_strings,
328 new chromeos::options::KeyboardHandler()); 329 new chromeos::options::KeyboardHandler());
330 AddOptionsPageUIHandler(localized_strings,
331 new chromeos::options::PowerHandler());
329 332
330 chromeos::options::PointerHandler* pointer_handler = 333 chromeos::options::PointerHandler* pointer_handler =
331 new chromeos::options::PointerHandler(); 334 new chromeos::options::PointerHandler();
332 AddOptionsPageUIHandler(localized_strings, pointer_handler); 335 AddOptionsPageUIHandler(localized_strings, pointer_handler);
333 336
334 AddOptionsPageUIHandler(localized_strings, 337 AddOptionsPageUIHandler(localized_strings,
335 new chromeos::options::ProxyHandler()); 338 new chromeos::options::ProxyHandler());
336 AddOptionsPageUIHandler( 339 AddOptionsPageUIHandler(
337 localized_strings, 340 localized_strings,
338 new chromeos::options::ChangePictureOptionsHandler()); 341 new chromeos::options::ChangePictureOptionsHandler());
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 // Add only if handler's service is enabled. 477 // Add only if handler's service is enabled.
475 if (handler->IsEnabled()) { 478 if (handler->IsEnabled()) {
476 // Add handler to the list and also pass the ownership. 479 // Add handler to the list and also pass the ownership.
477 web_ui()->AddMessageHandler(handler.release()); 480 web_ui()->AddMessageHandler(handler.release());
478 handler_raw->GetLocalizedValues(localized_strings); 481 handler_raw->GetLocalizedValues(localized_strings);
479 handlers_.push_back(handler_raw); 482 handlers_.push_back(handler_raw);
480 } 483 }
481 } 484 }
482 485
483 } // namespace options 486 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/power_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698