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

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: 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 1732 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 "BrowserOptions.updateEasyUnlock", 1743 "BrowserOptions.updateEasyUnlock",
1744 has_pairing_value); 1744 has_pairing_value);
1745 } 1745 }
1746 1746
1747 void BrowserOptionsHandler::SetupExtensionControlledIndicators() { 1747 void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
1748 #if defined(OS_WIN) 1748 #if defined(OS_WIN)
1749 base::DictionaryValue extension_controlled; 1749 base::DictionaryValue extension_controlled;
1750 1750
1751 // Check if an extension is overriding the Search Engine. 1751 // Check if an extension is overriding the Search Engine.
1752 const extensions::Extension* extension = extensions::OverridesSearchEngine( 1752 const extensions::Extension* extension = extensions::OverridesSearchEngine(
1753 Profile::FromWebUI(web_ui()), NULL); 1753 Profile::FromWebUI(web_ui()));
1754 AppendExtensionData("searchEngine", extension, &extension_controlled); 1754 AppendExtensionData("searchEngine", extension, &extension_controlled);
1755 1755
1756 // Check if an extension is overriding the Home page. 1756 // Check if an extension is overriding the Home page.
1757 extension = extensions::OverridesHomepage(Profile::FromWebUI(web_ui()), NULL); 1757 extension = extensions::OverridesHomepage(Profile::FromWebUI(web_ui()), NULL);
1758 AppendExtensionData("homePage", extension, &extension_controlled); 1758 AppendExtensionData("homePage", extension, &extension_controlled);
1759 1759
1760 // Check if an extension is overriding the Startup pages. 1760 // Check if an extension is overriding the Startup pages.
1761 extension = extensions::OverridesStartupPages( 1761 extension = extensions::OverridesStartupPages(
1762 Profile::FromWebUI(web_ui()), NULL); 1762 Profile::FromWebUI(web_ui()), NULL);
1763 AppendExtensionData("startUpPage", extension, &extension_controlled); 1763 AppendExtensionData("startUpPage", extension, &extension_controlled);
(...skipping 14 matching lines...) Expand all
1778 ExtensionRegistry::ENABLED); 1778 ExtensionRegistry::ENABLED);
1779 } 1779 }
1780 AppendExtensionData("newTabPage", extension, &extension_controlled); 1780 AppendExtensionData("newTabPage", extension, &extension_controlled);
1781 1781
1782 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1782 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1783 extension_controlled); 1783 extension_controlled);
1784 #endif // defined(OS_WIN) 1784 #endif // defined(OS_WIN)
1785 } 1785 }
1786 1786
1787 } // namespace options 1787 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698