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

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: 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "chrome/browser/chromeos/system/pointer_device_observer.h" 67 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
68 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 68 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
69 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 69 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
70 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 70 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
71 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 71 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
72 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 72 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
73 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h" 73 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
74 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h" 74 #include "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
75 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 75 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
76 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 76 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
77 #include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
78 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
79 #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
80 #include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
81 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h" 77 #include "chrome/browser/ui/webui/options/chromeos/pointer_handler.h"
82 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 78 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
83 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h" 79 #include "chrome/browser/ui/webui/options/chromeos/stats_options_handler.h"
84 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 80 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
85 #endif 81 #endif
86 82
87 #if defined(USE_NSS) 83 #if defined(USE_NSS)
88 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" 84 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
89 #endif 85 #endif
90 86
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 new chromeos::options::AccountsOptionsHandler()); 287 new chromeos::options::AccountsOptionsHandler());
292 AddOptionsPageUIHandler(localized_strings, 288 AddOptionsPageUIHandler(localized_strings,
293 new chromeos::options::BluetoothOptionsHandler()); 289 new chromeos::options::BluetoothOptionsHandler());
294 AddOptionsPageUIHandler(localized_strings, 290 AddOptionsPageUIHandler(localized_strings,
295 new chromeos::options::DisplayOptionsHandler()); 291 new chromeos::options::DisplayOptionsHandler());
296 AddOptionsPageUIHandler(localized_strings, 292 AddOptionsPageUIHandler(localized_strings,
297 new chromeos::options::DisplayOverscanHandler()); 293 new chromeos::options::DisplayOverscanHandler());
298 AddOptionsPageUIHandler(localized_strings, 294 AddOptionsPageUIHandler(localized_strings,
299 new chromeos::options::InternetOptionsHandler()); 295 new chromeos::options::InternetOptionsHandler());
300 AddOptionsPageUIHandler(localized_strings, 296 AddOptionsPageUIHandler(localized_strings,
301 new chromeos::options::LanguageChewingHandler());
302 AddOptionsPageUIHandler(localized_strings,
303 new chromeos::options::KeyboardHandler()); 297 new chromeos::options::KeyboardHandler());
304 AddOptionsPageUIHandler(localized_strings,
305 new chromeos::options::LanguageHangulHandler());
306 AddOptionsPageUIHandler(localized_strings,
307 new chromeos::options::LanguageMozcHandler());
308 AddOptionsPageUIHandler(localized_strings,
309 new chromeos::options::LanguagePinyinHandler());
310 298
311 chromeos::options::PointerHandler* pointer_handler = 299 chromeos::options::PointerHandler* pointer_handler =
312 new chromeos::options::PointerHandler(); 300 new chromeos::options::PointerHandler();
313 AddOptionsPageUIHandler(localized_strings, pointer_handler); 301 AddOptionsPageUIHandler(localized_strings, pointer_handler);
314 302
315 AddOptionsPageUIHandler(localized_strings, 303 AddOptionsPageUIHandler(localized_strings,
316 new chromeos::options::ProxyHandler()); 304 new chromeos::options::ProxyHandler());
317 AddOptionsPageUIHandler( 305 AddOptionsPageUIHandler(
318 localized_strings, 306 localized_strings,
319 new chromeos::options::ChangePictureOptionsHandler()); 307 new chromeos::options::ChangePictureOptionsHandler());
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 // Add only if handler's service is enabled. 420 // Add only if handler's service is enabled.
433 if (handler->IsEnabled()) { 421 if (handler->IsEnabled()) {
434 // Add handler to the list and also pass the ownership. 422 // Add handler to the list and also pass the ownership.
435 web_ui()->AddMessageHandler(handler.release()); 423 web_ui()->AddMessageHandler(handler.release());
436 handler_raw->GetLocalizedValues(localized_strings); 424 handler_raw->GetLocalizedValues(localized_strings);
437 handlers_.push_back(handler_raw); 425 handlers_.push_back(handler_raw);
438 } 426 }
439 } 427 }
440 428
441 } // namespace options 429 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698