summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authortreib <treib@chromium.org>2015-07-27 01:53:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-27 08:54:02 +0000
commit11ce5d50e71686e2335ede01ca54a902175ca07c (patch)
tree013a54ba0ae23f3e52cc91040b2befae2a618dda /extensions/shell
parent943561e62868d499c7ac4ca67e96a1baabc5a0bb (diff)
downloadchromium_src-11ce5d50e71686e2335ede01ca54a902175ca07c.zip
chromium_src-11ce5d50e71686e2335ede01ca54a902175ca07c.tar.gz
chromium_src-11ce5d50e71686e2335ede01ca54a902175ca07c.tar.bz2
Cleanup: give ChromeAppSorting a BrowserContext
This allows us to remove the yucky AppSorting::SetExtensionSyncService method, as well as ExtensionSyncService::SyncOrderingChange. BUG=None Review URL: https://codereview.chromium.org/1251323003 Cr-Commit-Position: refs/heads/master@{#340440}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/browser/shell_extensions_browser_client.cc3
-rw-r--r--extensions/shell/browser/shell_extensions_browser_client.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc
index 6fc34e8..623980f 100644
--- a/extensions/shell/browser/shell_extensions_browser_client.cc
+++ b/extensions/shell/browser/shell_extensions_browser_client.cc
@@ -156,7 +156,8 @@ bool ShellExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) {
void ShellExtensionsBrowserClient::PermitExternalProtocolHandler() {
}
-scoped_ptr<AppSorting> ShellExtensionsBrowserClient::CreateAppSorting() {
+scoped_ptr<AppSorting> ShellExtensionsBrowserClient::CreateAppSorting(
+ content::BrowserContext* context) {
return scoped_ptr<AppSorting>(new NullAppSorting);
}
diff --git a/extensions/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h
index 9995d73..cd79e9d 100644
--- a/extensions/shell/browser/shell_extensions_browser_client.h
+++ b/extensions/shell/browser/shell_extensions_browser_client.h
@@ -66,7 +66,8 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() override;
bool DidVersionUpdate(content::BrowserContext* context) override;
void PermitExternalProtocolHandler() override;
- scoped_ptr<AppSorting> CreateAppSorting() override;
+ scoped_ptr<AppSorting> CreateAppSorting(
+ content::BrowserContext* context) override;
bool IsRunningInForcedAppMode() override;
ApiActivityMonitor* GetApiActivityMonitor(
content::BrowserContext* context) override;