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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chrome/browser/ui/webui/options/search_engine_manager_handler.cc » ('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) 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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/profiles/profile_avatar_icon_util.h" 40 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
41 #include "chrome/browser/profiles/profile_info_cache.h" 41 #include "chrome/browser/profiles/profile_info_cache.h"
42 #include "chrome/browser/profiles/profile_manager.h" 42 #include "chrome/browser/profiles/profile_manager.h"
43 #include "chrome/browser/profiles/profile_metrics.h" 43 #include "chrome/browser/profiles/profile_metrics.h"
44 #include "chrome/browser/profiles/profile_shortcut_manager.h" 44 #include "chrome/browser/profiles/profile_shortcut_manager.h"
45 #include "chrome/browser/profiles/profile_window.h" 45 #include "chrome/browser/profiles/profile_window.h"
46 #include "chrome/browser/profiles/profiles_state.h" 46 #include "chrome/browser/profiles/profiles_state.h"
47 #include "chrome/browser/search/hotword_service.h" 47 #include "chrome/browser/search/hotword_service.h"
48 #include "chrome/browser/search/hotword_service_factory.h" 48 #include "chrome/browser/search/hotword_service_factory.h"
49 #include "chrome/browser/search/search.h" 49 #include "chrome/browser/search/search.h"
50 #include "chrome/browser/search_engines/template_url_service.h"
50 #include "chrome/browser/search_engines/template_url_service_factory.h" 51 #include "chrome/browser/search_engines/template_url_service_factory.h"
51 #include "chrome/browser/signin/easy_unlock.h" 52 #include "chrome/browser/signin/easy_unlock.h"
52 #include "chrome/browser/signin/signin_manager_factory.h" 53 #include "chrome/browser/signin/signin_manager_factory.h"
53 #include "chrome/browser/sync/profile_sync_service.h" 54 #include "chrome/browser/sync/profile_sync_service.h"
54 #include "chrome/browser/sync/profile_sync_service_factory.h" 55 #include "chrome/browser/sync/profile_sync_service_factory.h"
55 #include "chrome/browser/sync/sync_ui_util.h" 56 #include "chrome/browser/sync/sync_ui_util.h"
56 #include "chrome/browser/themes/theme_service.h" 57 #include "chrome/browser/themes/theme_service.h"
57 #include "chrome/browser/themes/theme_service_factory.h" 58 #include "chrome/browser/themes/theme_service_factory.h"
58 #include "chrome/browser/ui/browser_finder.h" 59 #include "chrome/browser/ui/browser_finder.h"
59 #include "chrome/browser/ui/chrome_select_file_policy.h" 60 #include "chrome/browser/ui/chrome_select_file_policy.h"
60 #include "chrome/browser/ui/host_desktop.h" 61 #include "chrome/browser/ui/host_desktop.h"
61 #include "chrome/browser/ui/options/options_util.h" 62 #include "chrome/browser/ui/options/options_util.h"
62 #include "chrome/browser/ui/webui/favicon_source.h" 63 #include "chrome/browser/ui/webui/favicon_source.h"
63 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" 64 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
64 #include "chrome/common/chrome_constants.h" 65 #include "chrome/common/chrome_constants.h"
65 #include "chrome/common/chrome_paths.h" 66 #include "chrome/common/chrome_paths.h"
66 #include "chrome/common/chrome_switches.h" 67 #include "chrome/common/chrome_switches.h"
67 #include "chrome/common/extensions/extension_constants.h" 68 #include "chrome/common/extensions/extension_constants.h"
68 #include "chrome/common/pref_names.h" 69 #include "chrome/common/pref_names.h"
69 #include "chrome/common/url_constants.h" 70 #include "chrome/common/url_constants.h"
70 #include "chromeos/chromeos_switches.h" 71 #include "chromeos/chromeos_switches.h"
71 #include "components/search_engines/template_url.h" 72 #include "components/search_engines/template_url.h"
72 #include "components/search_engines/template_url_service.h"
73 #include "components/signin/core/browser/signin_manager.h" 73 #include "components/signin/core/browser/signin_manager.h"
74 #include "content/public/browser/browser_thread.h" 74 #include "content/public/browser/browser_thread.h"
75 #include "content/public/browser/download_manager.h" 75 #include "content/public/browser/download_manager.h"
76 #include "content/public/browser/navigation_controller.h" 76 #include "content/public/browser/navigation_controller.h"
77 #include "content/public/browser/notification_details.h" 77 #include "content/public/browser/notification_details.h"
78 #include "content/public/browser/notification_service.h" 78 #include "content/public/browser/notification_service.h"
79 #include "content/public/browser/notification_source.h" 79 #include "content/public/browser/notification_source.h"
80 #include "content/public/browser/notification_types.h" 80 #include "content/public/browser/notification_types.h"
81 #include "content/public/browser/url_data_source.h" 81 #include "content/public/browser/url_data_source.h"
82 #include "content/public/browser/user_metrics.h" 82 #include "content/public/browser/user_metrics.h"
(...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 extension = extensions::GetExtensionOverridingProxy( 1799 extension = extensions::GetExtensionOverridingProxy(
1800 Profile::FromWebUI(web_ui())); 1800 Profile::FromWebUI(web_ui()));
1801 AppendExtensionData("proxy", extension, &extension_controlled); 1801 AppendExtensionData("proxy", extension, &extension_controlled);
1802 1802
1803 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1803 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1804 extension_controlled); 1804 extension_controlled);
1805 #endif // defined(OS_WIN) 1805 #endif // defined(OS_WIN)
1806 } 1806 }
1807 1807
1808 } // namespace options 1808 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chrome/browser/ui/webui/options/search_engine_manager_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698