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

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

Issue 23548006: Remove IME related configuration preferences in Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary comments. Created 7 years, 3 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 68 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
69 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 69 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
70 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 70 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
71 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 71 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
72 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 72 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
73 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 73 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
74 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 74 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
75 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" 75 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
76 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 76 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
77 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 77 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
78 #include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
79 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
80 #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
81 #include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
82 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" 78 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
83 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 79 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
84 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" 80 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
85 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 81 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
86 #endif 82 #endif
87 83
88 #if defined(USE_NSS) 84 #if defined(USE_NSS)
89 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" 85 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
90 #endif 86 #endif
91 87
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 new chromeos::options::AccountsOptionsHandler()); 289 new chromeos::options::AccountsOptionsHandler());
294 AddOptionsPageUIHandler(localized_strings, 290 AddOptionsPageUIHandler(localized_strings,
295 new chromeos::options::BluetoothOptionsHandler()); 291 new chromeos::options::BluetoothOptionsHandler());
296 AddOptionsPageUIHandler(localized_strings, 292 AddOptionsPageUIHandler(localized_strings,
297 new chromeos::options::DisplayOptionsHandler()); 293 new chromeos::options::DisplayOptionsHandler());
298 AddOptionsPageUIHandler(localized_strings, 294 AddOptionsPageUIHandler(localized_strings,
299 new chromeos::options::DisplayOverscanHandler()); 295 new chromeos::options::DisplayOverscanHandler());
300 AddOptionsPageUIHandler(localized_strings, 296 AddOptionsPageUIHandler(localized_strings,
301 new chromeos::options::InternetOptionsHandler()); 297 new chromeos::options::InternetOptionsHandler());
302 AddOptionsPageUIHandler(localized_strings, 298 AddOptionsPageUIHandler(localized_strings,
303 new chromeos::options::LanguageChewingHandler());
304 AddOptionsPageUIHandler(localized_strings,
305 new chromeos::options::KeyboardHandler()); 299 new chromeos::options::KeyboardHandler());
306 AddOptionsPageUIHandler(localized_strings,
307 new chromeos::options::LanguageHangulHandler());
308 AddOptionsPageUIHandler(localized_strings,
309 new chromeos::options::LanguageMozcHandler());
310 AddOptionsPageUIHandler(localized_strings,
311 new chromeos::options::LanguagePinyinHandler());
312 300
313 chromeos::options::PointerHandler* pointer_handler = 301 chromeos::options::PointerHandler* pointer_handler =
314 new chromeos::options::PointerHandler(); 302 new chromeos::options::PointerHandler();
315 AddOptionsPageUIHandler(localized_strings, pointer_handler); 303 AddOptionsPageUIHandler(localized_strings, pointer_handler);
316 304
317 AddOptionsPageUIHandler(localized_strings, 305 AddOptionsPageUIHandler(localized_strings,
318 new chromeos::options::ProxyHandler()); 306 new chromeos::options::ProxyHandler());
319 AddOptionsPageUIHandler( 307 AddOptionsPageUIHandler(
320 localized_strings, 308 localized_strings,
321 new chromeos::options::ChangePictureOptionsHandler()); 309 new chromeos::options::ChangePictureOptionsHandler());
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 // Add only if handler's service is enabled. 422 // Add only if handler's service is enabled.
435 if (handler->IsEnabled()) { 423 if (handler->IsEnabled()) {
436 // Add handler to the list and also pass the ownership. 424 // Add handler to the list and also pass the ownership.
437 web_ui()->AddMessageHandler(handler.release()); 425 web_ui()->AddMessageHandler(handler.release());
438 handler_raw->GetLocalizedValues(localized_strings); 426 handler_raw->GetLocalizedValues(localized_strings);
439 handlers_.push_back(handler_raw); 427 handlers_.push_back(handler_raw);
440 } 428 }
441 } 429 }
442 430
443 } // namespace options 431 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698