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

Side by Side Diff: chrome/browser/dom_ui/options/options_ui.cc

Issue 5025001: Removed Labs section from Chrome OS settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed RegisterPref call Created 10 years, 1 month 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
« no previous file with comments | « chrome/browser/dom_ui/mediaplayer_ui.cc ('k') | chrome/browser/resources/options.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dom_ui/options/options_ui.h" 5 #include "chrome/browser/dom_ui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "grit/chromium_strings.h" 51 #include "grit/chromium_strings.h"
52 #include "grit/generated_resources.h" 52 #include "grit/generated_resources.h"
53 #include "grit/locale_settings.h" 53 #include "grit/locale_settings.h"
54 #include "grit/theme_resources.h" 54 #include "grit/theme_resources.h"
55 55
56 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
57 #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h" 57 #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h"
58 #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h" 58 #include "chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h"
59 #include "chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h" 59 #include "chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h"
60 #include "chrome/browser/chromeos/dom_ui/internet_options_handler.h" 60 #include "chrome/browser/chromeos/dom_ui/internet_options_handler.h"
61 #include "chrome/browser/chromeos/dom_ui/labs_handler.h"
62 #include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h" 61 #include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h"
63 #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handle r.h" 62 #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handle r.h"
64 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h" 63 #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
65 #include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h" 64 #include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h"
66 #include "chrome/browser/chromeos/dom_ui/language_options_handler.h" 65 #include "chrome/browser/chromeos/dom_ui/language_options_handler.h"
67 #include "chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h" 66 #include "chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h"
68 #include "chrome/browser/chromeos/dom_ui/proxy_handler.h" 67 #include "chrome/browser/chromeos/dom_ui/proxy_handler.h"
69 #include "chrome/browser/chromeos/dom_ui/stats_options_handler.h" 68 #include "chrome/browser/chromeos/dom_ui/stats_options_handler.h"
70 #include "chrome/browser/chromeos/dom_ui/system_options_handler.h" 69 #include "chrome/browser/chromeos/dom_ui/system_options_handler.h"
71 #endif 70 #endif
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler()); 154 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());
156 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 155 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
157 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 156 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
158 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler()); 157 AddOptionsPageUIHandler(localized_strings, new StopSyncingHandler());
159 AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler()); 158 AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler());
160 #if defined(OS_CHROMEOS) 159 #if defined(OS_CHROMEOS)
161 AddOptionsPageUIHandler(localized_strings, new AboutPageHandler()); 160 AddOptionsPageUIHandler(localized_strings, new AboutPageHandler());
162 AddOptionsPageUIHandler(localized_strings, 161 AddOptionsPageUIHandler(localized_strings,
163 new chromeos::AccountsOptionsHandler()); 162 new chromeos::AccountsOptionsHandler());
164 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler()); 163 AddOptionsPageUIHandler(localized_strings, new InternetOptionsHandler());
165 AddOptionsPageUIHandler(localized_strings, new LabsHandler());
166 AddOptionsPageUIHandler(localized_strings, 164 AddOptionsPageUIHandler(localized_strings,
167 new chromeos::LanguageChewingOptionsHandler()); 165 new chromeos::LanguageChewingOptionsHandler());
168 AddOptionsPageUIHandler(localized_strings, 166 AddOptionsPageUIHandler(localized_strings,
169 new chromeos::LanguageCustomizeModifierKeysHandler()); 167 new chromeos::LanguageCustomizeModifierKeysHandler());
170 AddOptionsPageUIHandler(localized_strings, 168 AddOptionsPageUIHandler(localized_strings,
171 new chromeos::LanguageHangulOptionsHandler()); 169 new chromeos::LanguageHangulOptionsHandler());
172 AddOptionsPageUIHandler(localized_strings, 170 AddOptionsPageUIHandler(localized_strings,
173 new chromeos::LanguageMozcOptionsHandler()); 171 new chromeos::LanguageMozcOptionsHandler());
174 AddOptionsPageUIHandler(localized_strings, 172 AddOptionsPageUIHandler(localized_strings,
175 new chromeos::LanguageOptionsHandler()); 173 new chromeos::LanguageOptionsHandler());
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 OptionsPageUIHandler* handler_raw) { 248 OptionsPageUIHandler* handler_raw) {
251 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); 249 scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
252 DCHECK(handler.get()); 250 DCHECK(handler.get());
253 // Add only if handler's service is enabled. 251 // Add only if handler's service is enabled.
254 if (handler->IsEnabled()) { 252 if (handler->IsEnabled()) {
255 handler->GetLocalizedValues(localized_strings); 253 handler->GetLocalizedValues(localized_strings);
256 // Add handler to the list and also pass the ownership. 254 // Add handler to the list and also pass the ownership.
257 AddMessageHandler(handler.release()->Attach(this)); 255 AddMessageHandler(handler.release()->Attach(this));
258 } 256 }
259 } 257 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/mediaplayer_ui.cc ('k') | chrome/browser/resources/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698