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

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

Issue 312943002: Remove unused param from search engine extension override helper function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync 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
« no previous file with comments | « chrome/browser/ui/views/settings_api_bubble_helper_views.cc ('k') | no next file » | 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 1738 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 has_pairing_value); 1749 has_pairing_value);
1750 } 1750 }
1751 1751
1752 void BrowserOptionsHandler::SetupExtensionControlledIndicators() { 1752 void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
1753 #if defined(OS_WIN) 1753 #if defined(OS_WIN)
1754 base::DictionaryValue extension_controlled; 1754 base::DictionaryValue extension_controlled;
1755 1755
1756 // Check if an extension is overriding the Search Engine. 1756 // Check if an extension is overriding the Search Engine.
1757 const extensions::Extension* extension = 1757 const extensions::Extension* extension =
1758 extensions::GetExtensionOverridingSearchEngine( 1758 extensions::GetExtensionOverridingSearchEngine(
1759 Profile::FromWebUI(web_ui()), NULL); 1759 Profile::FromWebUI(web_ui()));
1760 AppendExtensionData("searchEngine", extension, &extension_controlled); 1760 AppendExtensionData("searchEngine", extension, &extension_controlled);
1761 1761
1762 // Check if an extension is overriding the Home page. 1762 // Check if an extension is overriding the Home page.
1763 extension = extensions::GetExtensionOverridingHomepage( 1763 extension = extensions::GetExtensionOverridingHomepage(
1764 Profile::FromWebUI(web_ui()), NULL); 1764 Profile::FromWebUI(web_ui()));
1765 AppendExtensionData("homePage", extension, &extension_controlled); 1765 AppendExtensionData("homePage", extension, &extension_controlled);
1766 1766
1767 // Check if an extension is overriding the Startup pages. 1767 // Check if an extension is overriding the Startup pages.
1768 extension = extensions::GetExtensionOverridingStartupPages( 1768 extension = extensions::GetExtensionOverridingStartupPages(
1769 Profile::FromWebUI(web_ui()), NULL); 1769 Profile::FromWebUI(web_ui()));
1770 AppendExtensionData("startUpPage", extension, &extension_controlled); 1770 AppendExtensionData("startUpPage", extension, &extension_controlled);
1771 1771
1772 // Check if an extension is overriding the NTP page. 1772 // Check if an extension is overriding the NTP page.
1773 GURL ntp_url(chrome::kChromeUINewTabURL); 1773 GURL ntp_url(chrome::kChromeUINewTabURL);
1774 bool ignored_param; 1774 bool ignored_param;
1775 extension = NULL; 1775 extension = NULL;
1776 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary( 1776 content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
1777 &ntp_url, 1777 &ntp_url,
1778 web_ui()->GetWebContents()->GetBrowserContext(), 1778 web_ui()->GetWebContents()->GetBrowserContext(),
1779 &ignored_param); 1779 &ignored_param);
(...skipping 10 matching lines...) Expand all
1790 extension = extensions::GetExtensionOverridingProxy( 1790 extension = extensions::GetExtensionOverridingProxy(
1791 Profile::FromWebUI(web_ui())); 1791 Profile::FromWebUI(web_ui()));
1792 AppendExtensionData("proxy", extension, &extension_controlled); 1792 AppendExtensionData("proxy", extension, &extension_controlled);
1793 1793
1794 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1794 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1795 extension_controlled); 1795 extension_controlled);
1796 #endif // defined(OS_WIN) 1796 #endif // defined(OS_WIN)
1797 } 1797 }
1798 1798
1799 } // namespace options 1799 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/settings_api_bubble_helper_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698