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

Unified Diff: athena/content/app_registry_impl.cc

Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/app_activity_unittest.cc ('k') | athena/content/content_activity_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/app_registry_impl.cc
diff --git a/athena/content/app_registry_impl.cc b/athena/content/app_registry_impl.cc
index a140f119a49f5699affb1c083d8654b1a69ff446..69510c7b256f22f59d5275f665ae3aa8621b0d1d 100644
--- a/athena/content/app_registry_impl.cc
+++ b/athena/content/app_registry_impl.cc
@@ -5,7 +5,6 @@
#include "athena/content/public/app_registry.h"
#include "athena/content/app_activity_registry.h"
-#include "athena/content/public/app_content_control_delegate.h"
#include "base/logging.h"
namespace athena {
@@ -16,8 +15,6 @@ class AppRegistryImpl : public AppRegistry {
virtual ~AppRegistryImpl();
// AppRegistry:
- virtual void SetDelegate(AppContentControlDelegate* delegate) OVERRIDE;
- virtual AppContentControlDelegate* GetDelegate() OVERRIDE;
virtual AppActivityRegistry* GetAppActivityRegistry(
const std::string& app_id,
content::BrowserContext* browser_context) OVERRIDE;
@@ -27,9 +24,7 @@ class AppRegistryImpl : public AppRegistry {
virtual void RemoveAppActivityRegistry(
AppActivityRegistry* registry) OVERRIDE;
- std::vector<AppActivityRegistry*> app_list_;
-
- scoped_ptr<AppContentControlDelegate> delegate_;
+ std::vector<AppActivityRegistry*> app_list_;
DISALLOW_COPY_AND_ASSIGN(AppRegistryImpl);
};
@@ -40,22 +35,12 @@ AppRegistryImpl* instance = NULL;
} // namespace
-AppRegistryImpl::AppRegistryImpl() :
- delegate_(AppContentControlDelegate::CreateAppContentControlDelegate()) {}
-
+AppRegistryImpl::AppRegistryImpl() {
+}
AppRegistryImpl::~AppRegistryImpl() {
DCHECK(app_list_.empty());
}
-void AppRegistryImpl::SetDelegate(AppContentControlDelegate* delegate) {
- DCHECK(delegate);
- delegate_.reset(delegate);
-}
-
-AppContentControlDelegate* AppRegistryImpl::GetDelegate() {
- return delegate_.get();
-}
-
AppActivityRegistry* AppRegistryImpl::GetAppActivityRegistry(
const std::string& app_id,
content::BrowserContext* browser_context) {
« no previous file with comments | « athena/content/app_activity_unittest.cc ('k') | athena/content/content_activity_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698