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

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

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix space Created 7 years, 6 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/callback.h" 10 #include "base/callback.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 66 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
67 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 67 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
68 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 68 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
69 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 69 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
70 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 70 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
71 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 71 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
72 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 72 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
73 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" 73 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
74 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 74 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
75 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 75 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
76 #include "chrome/browser/ui/webui/options/chromeos/kiosk_apps_handler.h"
77 #include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h" 76 #include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
78 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h" 77 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
79 #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h" 78 #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
80 #include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h" 79 #include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
81 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" 80 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
82 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 81 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
83 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" 82 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
84 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 83 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
85 #endif 84 #endif
86 85
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 AddOptionsPageUIHandler(localized_strings, 284 AddOptionsPageUIHandler(localized_strings,
286 new chromeos::options::DisplayOptionsHandler()); 285 new chromeos::options::DisplayOptionsHandler());
287 AddOptionsPageUIHandler(localized_strings, 286 AddOptionsPageUIHandler(localized_strings,
288 new chromeos::options::DisplayOverscanHandler()); 287 new chromeos::options::DisplayOverscanHandler());
289 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); 288 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
290 AddOptionsPageUIHandler(localized_strings, 289 AddOptionsPageUIHandler(localized_strings,
291 new chromeos::options::LanguageChewingHandler()); 290 new chromeos::options::LanguageChewingHandler());
292 AddOptionsPageUIHandler(localized_strings, 291 AddOptionsPageUIHandler(localized_strings,
293 new chromeos::options::KeyboardHandler()); 292 new chromeos::options::KeyboardHandler());
294 AddOptionsPageUIHandler(localized_strings, 293 AddOptionsPageUIHandler(localized_strings,
295 new chromeos::options::KioskAppsHandler());
296 AddOptionsPageUIHandler(localized_strings,
297 new chromeos::options::LanguageHangulHandler()); 294 new chromeos::options::LanguageHangulHandler());
298 AddOptionsPageUIHandler(localized_strings, 295 AddOptionsPageUIHandler(localized_strings,
299 new chromeos::options::LanguageMozcHandler()); 296 new chromeos::options::LanguageMozcHandler());
300 AddOptionsPageUIHandler(localized_strings, 297 AddOptionsPageUIHandler(localized_strings,
301 new chromeos::options::LanguagePinyinHandler()); 298 new chromeos::options::LanguagePinyinHandler());
302 299
303 chromeos::options::PointerHandler* pointer_handler = 300 chromeos::options::PointerHandler* pointer_handler =
304 new chromeos::options::PointerHandler(); 301 new chromeos::options::PointerHandler();
305 AddOptionsPageUIHandler(localized_strings, pointer_handler); 302 AddOptionsPageUIHandler(localized_strings, pointer_handler);
306 303
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 // Add only if handler's service is enabled. 421 // Add only if handler's service is enabled.
425 if (handler->IsEnabled()) { 422 if (handler->IsEnabled()) {
426 // Add handler to the list and also pass the ownership. 423 // Add handler to the list and also pass the ownership.
427 web_ui()->AddMessageHandler(handler.release()); 424 web_ui()->AddMessageHandler(handler.release());
428 handler_raw->GetLocalizedValues(localized_strings); 425 handler_raw->GetLocalizedValues(localized_strings);
429 handlers_.push_back(handler_raw); 426 handlers_.push_back(handler_raw);
430 } 427 }
431 } 428 }
432 429
433 } // namespace options 430 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/kiosk_apps_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698