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

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

Issue 8366016: Split out bluetooth UI handler from system UI handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "grit/locale_settings.h" 54 #include "grit/locale_settings.h"
55 #include "grit/options_resources.h" 55 #include "grit/options_resources.h"
56 #include "grit/theme_resources.h" 56 #include "grit/theme_resources.h"
57 #include "grit/theme_resources_standard.h" 57 #include "grit/theme_resources_standard.h"
58 #include "net/base/escape.h" 58 #include "net/base/escape.h"
59 #include "ui/base/resource/resource_bundle.h" 59 #include "ui/base/resource/resource_bundle.h"
60 60
61 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
62 #include "chrome/browser/ui/webui/options/chromeos/about_page_handler.h" 62 #include "chrome/browser/ui/webui/options/chromeos/about_page_handler.h"
63 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 63 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
64 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
64 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h" 65 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
65 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h" 66 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
66 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 67 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
67 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" 68 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
68 #include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h" 69 #include "chrome/browser/ui/webui/options/chromeos/language_chewing_handler.h"
69 #include "chrome/browser/ui/webui/options/chromeos/language_customize_modifier_k eys_handler.h" 70 #include "chrome/browser/ui/webui/options/chromeos/language_customize_modifier_k eys_handler.h"
70 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h" 71 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h"
71 #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h" 72 #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h"
72 #include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h" 73 #include "chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.h"
73 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" 74 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 230 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
230 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 231 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
231 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler()); 232 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
232 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler( 233 AddOptionsPageUIHandler(localized_strings, new OptionsSyncSetupHandler(
233 g_browser_process->profile_manager())); 234 g_browser_process->profile_manager()));
234 #if defined(OS_CHROMEOS) 235 #if defined(OS_CHROMEOS)
235 AddOptionsPageUIHandler(localized_strings, 236 AddOptionsPageUIHandler(localized_strings,
236 new chromeos::AboutPageHandler()); 237 new chromeos::AboutPageHandler());
237 AddOptionsPageUIHandler(localized_strings, 238 AddOptionsPageUIHandler(localized_strings,
238 new chromeos::AccountsOptionsHandler()); 239 new chromeos::AccountsOptionsHandler());
240 AddOptionsPageUIHandler(localized_strings,
241 new chromeos::BluetoothOptionsHandler());
239 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); 242 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
240 AddOptionsPageUIHandler(localized_strings, 243 AddOptionsPageUIHandler(localized_strings,
241 new chromeos::LanguageChewingHandler()); 244 new chromeos::LanguageChewingHandler());
242 AddOptionsPageUIHandler(localized_strings, 245 AddOptionsPageUIHandler(localized_strings,
243 new chromeos::LanguageCustomizeModifierKeysHandler()); 246 new chromeos::LanguageCustomizeModifierKeysHandler());
244 AddOptionsPageUIHandler(localized_strings, 247 AddOptionsPageUIHandler(localized_strings,
245 new chromeos::LanguageHangulHandler()); 248 new chromeos::LanguageHangulHandler());
246 AddOptionsPageUIHandler(localized_strings, 249 AddOptionsPageUIHandler(localized_strings,
247 new chromeos::LanguageMozcHandler()); 250 new chromeos::LanguageMozcHandler());
248 AddOptionsPageUIHandler(localized_strings, 251 AddOptionsPageUIHandler(localized_strings,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 OptionsPageUIHandler* handler_raw) { 350 OptionsPageUIHandler* handler_raw) {
348 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); 351 scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
349 DCHECK(handler.get()); 352 DCHECK(handler.get());
350 // Add only if handler's service is enabled. 353 // Add only if handler's service is enabled.
351 if (handler->IsEnabled()) { 354 if (handler->IsEnabled()) {
352 handler->GetLocalizedValues(localized_strings); 355 handler->GetLocalizedValues(localized_strings);
353 // Add handler to the list and also pass the ownership. 356 // Add handler to the list and also pass the ownership.
354 AddMessageHandler(handler.release()->Attach(this)); 357 AddMessageHandler(handler.release()->Attach(this));
355 } 358 }
356 } 359 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/system_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698