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

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

Issue 7796020: Rename intents_settings_handler files to web_intents_settings_handler. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to head Created 9 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 | 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 11 matching lines...) Expand all
22 #include "chrome/browser/ui/webui/options/autofill_options_handler.h" 22 #include "chrome/browser/ui/webui/options/autofill_options_handler.h"
23 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 23 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
24 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" 24 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
25 #include "chrome/browser/ui/webui/options/content_settings_handler.h" 25 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
26 #include "chrome/browser/ui/webui/options/handler_options_handler.h" 26 #include "chrome/browser/ui/webui/options/handler_options_handler.h"
27 #include "chrome/browser/ui/webui/options/cookies_view_handler.h" 27 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
28 #include "chrome/browser/ui/webui/options/core_options_handler.h" 28 #include "chrome/browser/ui/webui/options/core_options_handler.h"
29 #include "chrome/browser/ui/webui/options/extension_settings_handler.h" 29 #include "chrome/browser/ui/webui/options/extension_settings_handler.h"
30 #include "chrome/browser/ui/webui/options/font_settings_handler.h" 30 #include "chrome/browser/ui/webui/options/font_settings_handler.h"
31 #include "chrome/browser/ui/webui/options/import_data_handler.h" 31 #include "chrome/browser/ui/webui/options/import_data_handler.h"
32 #include "chrome/browser/ui/webui/options/intents_settings_handler.h" 32 #include "chrome/browser/ui/webui/options/web_intents_settings_handler.h"
33 #include "chrome/browser/ui/webui/options/language_options_handler.h" 33 #include "chrome/browser/ui/webui/options/language_options_handler.h"
34 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 34 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
35 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" 35 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
36 #include "chrome/browser/ui/webui/options/pack_extension_handler.h" 36 #include "chrome/browser/ui/webui/options/pack_extension_handler.h"
37 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 37 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
38 #include "chrome/browser/ui/webui/options/personal_options_handler.h" 38 #include "chrome/browser/ui/webui/options/personal_options_handler.h"
39 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 39 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
40 #include "chrome/browser/ui/webui/options/stop_syncing_handler.h" 40 #include "chrome/browser/ui/webui/options/stop_syncing_handler.h"
41 #include "chrome/browser/ui/webui/theme_source.h" 41 #include "chrome/browser/ui/webui/theme_source.h"
42 #include "chrome/common/jstemplate_builder.h" 42 #include "chrome/common/jstemplate_builder.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 AddOptionsPageUIHandler(localized_strings, core_handler); 207 AddOptionsPageUIHandler(localized_strings, core_handler);
208 208
209 AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler()); 209 AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler());
210 AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler()); 210 AddOptionsPageUIHandler(localized_strings, new AutofillOptionsHandler());
211 AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler()); 211 AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler());
212 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler()); 212 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
213 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); 213 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
214 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler()); 214 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
215 AddOptionsPageUIHandler(localized_strings, new ExtensionSettingsHandler()); 215 AddOptionsPageUIHandler(localized_strings, new ExtensionSettingsHandler());
216 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); 216 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
217 AddOptionsPageUIHandler(localized_strings, new IntentsSettingsHandler()); 217 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
218 #if defined(OS_CHROMEOS) 218 #if defined(OS_CHROMEOS)
219 AddOptionsPageUIHandler(localized_strings, 219 AddOptionsPageUIHandler(localized_strings,
220 new chromeos::CrosLanguageOptionsHandler()); 220 new chromeos::CrosLanguageOptionsHandler());
221 #else 221 #else
222 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 222 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
223 #endif 223 #endif
224 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 224 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
225 AddOptionsPageUIHandler(localized_strings, new PackExtensionHandler()); 225 AddOptionsPageUIHandler(localized_strings, new PackExtensionHandler());
226 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 226 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
227 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler()); 227 AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler());
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 OptionsPageUIHandler* handler_raw) { 345 OptionsPageUIHandler* handler_raw) {
346 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); 346 scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
347 DCHECK(handler.get()); 347 DCHECK(handler.get());
348 // Add only if handler's service is enabled. 348 // Add only if handler's service is enabled.
349 if (handler->IsEnabled()) { 349 if (handler->IsEnabled()) {
350 handler->GetLocalizedValues(localized_strings); 350 handler->GetLocalizedValues(localized_strings);
351 // Add handler to the list and also pass the ownership. 351 // Add handler to the list and also pass the ownership.
352 AddMessageHandler(handler.release()->Attach(this)); 352 AddMessageHandler(handler.release()->Attach(this));
353 } 353 }
354 } 354 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698