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

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

Issue 320253004: Componentize URLFixerUpper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win64 fix Created 6 years, 6 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) 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/ui/browser_finder.h" 60 #include "chrome/browser/ui/browser_finder.h"
61 #include "chrome/browser/ui/chrome_select_file_policy.h" 61 #include "chrome/browser/ui/chrome_select_file_policy.h"
62 #include "chrome/browser/ui/host_desktop.h" 62 #include "chrome/browser/ui/host_desktop.h"
63 #include "chrome/browser/ui/options/options_util.h" 63 #include "chrome/browser/ui/options/options_util.h"
64 #include "chrome/browser/ui/webui/favicon_source.h" 64 #include "chrome/browser/ui/webui/favicon_source.h"
65 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" 65 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
66 #include "chrome/common/chrome_constants.h" 66 #include "chrome/common/chrome_constants.h"
67 #include "chrome/common/chrome_paths.h" 67 #include "chrome/common/chrome_paths.h"
68 #include "chrome/common/chrome_switches.h" 68 #include "chrome/common/chrome_switches.h"
69 #include "chrome/common/extensions/extension_constants.h" 69 #include "chrome/common/extensions/extension_constants.h"
70 #include "chrome/common/net/url_fixer_upper.h"
71 #include "chrome/common/pref_names.h" 70 #include "chrome/common/pref_names.h"
72 #include "chrome/common/url_constants.h" 71 #include "chrome/common/url_constants.h"
73 #include "chromeos/chromeos_switches.h" 72 #include "chromeos/chromeos_switches.h"
74 #include "components/signin/core/browser/signin_manager.h" 73 #include "components/signin/core/browser/signin_manager.h"
75 #include "content/public/browser/browser_thread.h" 74 #include "content/public/browser/browser_thread.h"
76 #include "content/public/browser/download_manager.h" 75 #include "content/public/browser/download_manager.h"
77 #include "content/public/browser/navigation_controller.h" 76 #include "content/public/browser/navigation_controller.h"
78 #include "content/public/browser/notification_details.h" 77 #include "content/public/browser/notification_details.h"
79 #include "content/public/browser/notification_service.h" 78 #include "content/public/browser/notification_service.h"
80 #include "content/public/browser/notification_source.h" 79 #include "content/public/browser/notification_source.h"
(...skipping 1709 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 extension = extensions::GetExtensionOverridingProxy( 1789 extension = extensions::GetExtensionOverridingProxy(
1791 Profile::FromWebUI(web_ui())); 1790 Profile::FromWebUI(web_ui()));
1792 AppendExtensionData("proxy", extension, &extension_controlled); 1791 AppendExtensionData("proxy", extension, &extension_controlled);
1793 1792
1794 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1793 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1795 extension_controlled); 1794 extension_controlled);
1796 #endif // defined(OS_WIN) 1795 #endif // defined(OS_WIN)
1797 } 1796 }
1798 1797
1799 } // namespace options 1798 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | chrome/browser/ui/webui/options/core_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698