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

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

Issue 11410040: Delete WebUI for web intents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Return value from flag for profile disablement Created 8 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
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 22 matching lines...) Expand all
33 #include "chrome/browser/ui/webui/options/handler_options_handler.h" 33 #include "chrome/browser/ui/webui/options/handler_options_handler.h"
34 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h" 34 #include "chrome/browser/ui/webui/options/home_page_overlay_handler.h"
35 #include "chrome/browser/ui/webui/options/import_data_handler.h" 35 #include "chrome/browser/ui/webui/options/import_data_handler.h"
36 #include "chrome/browser/ui/webui/options/language_options_handler.h" 36 #include "chrome/browser/ui/webui/options/language_options_handler.h"
37 #include "chrome/browser/ui/webui/options/manage_profile_handler.h" 37 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
38 #include "chrome/browser/ui/webui/options/media_galleries_handler.h" 38 #include "chrome/browser/ui/webui/options/media_galleries_handler.h"
39 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" 39 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
40 #include "chrome/browser/ui/webui/options/password_manager_handler.h" 40 #include "chrome/browser/ui/webui/options/password_manager_handler.h"
41 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" 41 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
42 #include "chrome/browser/ui/webui/options/startup_pages_handler.h" 42 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
43 #include "chrome/browser/ui/webui/options/web_intents_settings_handler.h"
44 #include "chrome/browser/ui/webui/theme_source.h" 43 #include "chrome/browser/ui/webui/theme_source.h"
45 #include "chrome/common/jstemplate_builder.h" 44 #include "chrome/common/jstemplate_builder.h"
46 #include "chrome/common/time_format.h" 45 #include "chrome/common/time_format.h"
47 #include "chrome/common/url_constants.h" 46 #include "chrome/common/url_constants.h"
48 #include "content/public/browser/browser_thread.h" 47 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/notification_types.h" 48 #include "content/public/browser/notification_types.h"
50 #include "content/public/browser/render_view_host.h" 49 #include "content/public/browser/render_view_host.h"
51 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
52 #include "content/public/browser/web_contents_delegate.h" 51 #include "content/public/browser/web_contents_delegate.h"
53 #include "content/public/browser/web_ui.h" 52 #include "content/public/browser/web_ui.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 234
236 BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler(); 235 BrowserOptionsHandler* browser_options_handler = new BrowserOptionsHandler();
237 AddOptionsPageUIHandler(localized_strings, browser_options_handler); 236 AddOptionsPageUIHandler(localized_strings, browser_options_handler);
238 237
239 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler()); 238 AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
240 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); 239 AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
241 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler()); 240 AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
242 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); 241 AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
243 AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler()); 242 AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
244 AddOptionsPageUIHandler(localized_strings, new MediaGalleriesHandler()); 243 AddOptionsPageUIHandler(localized_strings, new MediaGalleriesHandler());
245 AddOptionsPageUIHandler(localized_strings, new WebIntentsSettingsHandler());
246 #if defined(OS_CHROMEOS) 244 #if defined(OS_CHROMEOS)
247 AddOptionsPageUIHandler(localized_strings, 245 AddOptionsPageUIHandler(localized_strings,
248 new chromeos::options::CrosLanguageOptionsHandler()); 246 new chromeos::options::CrosLanguageOptionsHandler());
249 #else 247 #else
250 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); 248 AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
251 #endif 249 #endif
252 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler()); 250 AddOptionsPageUIHandler(localized_strings, new ManageProfileHandler());
253 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler()); 251 AddOptionsPageUIHandler(localized_strings, new PasswordManagerHandler());
254 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); 252 AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler());
255 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler()); 253 AddOptionsPageUIHandler(localized_strings, new ImportDataHandler());
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 // Add only if handler's service is enabled. 404 // Add only if handler's service is enabled.
407 if (handler->IsEnabled()) { 405 if (handler->IsEnabled()) {
408 // Add handler to the list and also pass the ownership. 406 // Add handler to the list and also pass the ownership.
409 web_ui()->AddMessageHandler(handler.release()); 407 web_ui()->AddMessageHandler(handler.release());
410 handler_raw->GetLocalizedValues(localized_strings); 408 handler_raw->GetLocalizedValues(localized_strings);
411 handlers_.push_back(handler_raw); 409 handlers_.push_back(handler_raw);
412 } 410 }
413 } 411 }
414 412
415 } // namespace options 413 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698