| OLD | NEW | 
|---|
| 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/options2/options_ui2.h" | 5 #include "chrome/browser/ui/webui/options2/options_ui2.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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 60 #include "ui/base/layout.h" | 60 #include "ui/base/layout.h" | 
| 61 #include "ui/base/resource/resource_bundle.h" | 61 #include "ui/base/resource/resource_bundle.h" | 
| 62 | 62 | 
| 63 #if defined(OS_CHROMEOS) | 63 #if defined(OS_CHROMEOS) | 
| 64 #include "chrome/browser/chromeos/system/pointer_device_observer.h" | 64 #include "chrome/browser/chromeos/system/pointer_device_observer.h" | 
| 65 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h" | 65 #include "chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.h" | 
| 66 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h
     " | 66 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h
     " | 
| 67 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl
     er2.h" | 67 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl
     er2.h" | 
| 68 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle
     r2.h" | 68 #include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handle
     r2.h" | 
| 69 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handle
     r2.h" | 69 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handle
     r2.h" | 
|  | 70 #include "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h" | 
| 70 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h" | 71 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h" | 
| 71 #include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.h" | 72 #include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.h" | 
| 72 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h" | 73 #include "chrome/browser/ui/webui/options2/chromeos/language_chewing_handler2.h" | 
| 73 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" | 74 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h" | 
| 74 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" | 75 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h" | 
| 75 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h" | 76 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h" | 
| 76 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h" | 77 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h" | 
| 77 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h" | 78 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h" | 
| 78 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h" | 79 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h" | 
| 79 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" | 80 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" | 
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 246   AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); | 247   AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); | 
| 247   AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); | 248   AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); | 
| 248   AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); | 249   AddOptionsPageUIHandler(localized_strings, new StartupPagesHandler()); | 
| 249   AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( | 250   AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( | 
| 250       g_browser_process->profile_manager())); | 251       g_browser_process->profile_manager())); | 
| 251 #if defined(OS_CHROMEOS) | 252 #if defined(OS_CHROMEOS) | 
| 252   AddOptionsPageUIHandler(localized_strings, | 253   AddOptionsPageUIHandler(localized_strings, | 
| 253                           new chromeos::options2::AccountsOptionsHandler()); | 254                           new chromeos::options2::AccountsOptionsHandler()); | 
| 254   AddOptionsPageUIHandler(localized_strings, | 255   AddOptionsPageUIHandler(localized_strings, | 
| 255                           new chromeos::options2::BluetoothOptionsHandler()); | 256                           new chromeos::options2::BluetoothOptionsHandler()); | 
|  | 257   AddOptionsPageUIHandler(localized_strings, | 
|  | 258                           new chromeos::options2::DisplayOptionsHandler()); | 
| 256   AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); | 259   AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); | 
| 257   AddOptionsPageUIHandler(localized_strings, | 260   AddOptionsPageUIHandler(localized_strings, | 
| 258                           new chromeos::options2::LanguageChewingHandler()); | 261                           new chromeos::options2::LanguageChewingHandler()); | 
| 259   AddOptionsPageUIHandler(localized_strings, | 262   AddOptionsPageUIHandler(localized_strings, | 
| 260                           new chromeos::options2::KeyboardHandler()); | 263                           new chromeos::options2::KeyboardHandler()); | 
| 261   AddOptionsPageUIHandler(localized_strings, | 264   AddOptionsPageUIHandler(localized_strings, | 
| 262                           new chromeos::options2::LanguageHangulHandler()); | 265                           new chromeos::options2::LanguageHangulHandler()); | 
| 263   AddOptionsPageUIHandler(localized_strings, | 266   AddOptionsPageUIHandler(localized_strings, | 
| 264                           new chromeos::options2::LanguageMozcHandler()); | 267                           new chromeos::options2::LanguageMozcHandler()); | 
| 265   AddOptionsPageUIHandler(localized_strings, | 268   AddOptionsPageUIHandler(localized_strings, | 
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 384   // Add only if handler's service is enabled. | 387   // Add only if handler's service is enabled. | 
| 385   if (handler->IsEnabled()) { | 388   if (handler->IsEnabled()) { | 
| 386     // Add handler to the list and also pass the ownership. | 389     // Add handler to the list and also pass the ownership. | 
| 387     web_ui()->AddMessageHandler(handler.release()); | 390     web_ui()->AddMessageHandler(handler.release()); | 
| 388     handler_raw->GetLocalizedValues(localized_strings); | 391     handler_raw->GetLocalizedValues(localized_strings); | 
| 389     handlers_.push_back(handler_raw); | 392     handlers_.push_back(handler_raw); | 
| 390   } | 393   } | 
| 391 } | 394 } | 
| 392 | 395 | 
| 393 }  // namespace options2 | 396 }  // namespace options2 | 
| OLD | NEW | 
|---|