Chromium Code Reviews| Index: athena/extensions/chrome/extensions_delegate_impl.cc |
| diff --git a/athena/extensions/chrome/extensions_delegate_impl.cc b/athena/extensions/chrome/extensions_delegate_impl.cc |
| index d6b85129bddfc9b9342da8dfb4e9e2c762801b5f..1a594f05fa09e08efd9a1a9d9537fc58fee745db 100644 |
| --- a/athena/extensions/chrome/extensions_delegate_impl.cc |
| +++ b/athena/extensions/chrome/extensions_delegate_impl.cc |
| @@ -6,7 +6,7 @@ |
| #include "athena/activity/public/activity_factory.h" |
| #include "athena/activity/public/activity_manager.h" |
| -#include "athena/extensions/chrome/athena_chrome_apps_client.h" |
| +#include "athena/extensions/chrome/athena_chrome_app_window_client.h" |
| #include "base/macros.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "chrome/browser/extensions/extension_service.h" |
| @@ -29,10 +29,12 @@ class ChromeExtensionsDelegate : public ExtensionsDelegate { |
| explicit ChromeExtensionsDelegate(content::BrowserContext* context) |
| : extension_service_( |
| extensions::ExtensionSystem::Get(context)->extension_service()) { |
| - extensions::AppsClient::Set(&apps_client_); |
| + extensions::AppWindowClient::Set(&apps_client_); |
| } |
| - virtual ~ChromeExtensionsDelegate() { extensions::AppsClient::Set(NULL); } |
| + virtual ~ChromeExtensionsDelegate() { |
| + extensions::AppWindowClient::Set(NULL); |
| + } |
| private: |
| // ExtensionsDelegate: |
| @@ -106,7 +108,7 @@ class ChromeExtensionsDelegate : public ExtensionsDelegate { |
| // Installed extensions. |
| extensions::ExtensionSet extensions_; |
| - AthenaChromeAppsClient apps_client_; |
| + AthenaChromeAppWindowClient apps_client_; |
|
hashimoto
2014/09/19 02:44:37
Also rename this variable?
|
| DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsDelegate); |
| }; |