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

Unified Diff: athena/home/home_card_impl.h

Issue 663623002: Don't hide home card upon activation change (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 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 | « no previous file | athena/home/home_card_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/home_card_impl.h
diff --git a/athena/home/home_card_impl.h b/athena/home/home_card_impl.h
index 98ea3a63b206e970f597ae0d236e7c4e4cd4018b..5dca79933946b4a40ab85b9916f262fc9f28fe28 100644
--- a/athena/home/home_card_impl.h
+++ b/athena/home/home_card_impl.h
@@ -11,14 +11,9 @@
#include "athena/home/public/search_controller_factory.h"
#include "athena/input/public/accelerator_manager.h"
#include "athena/wm/public/window_manager_observer.h"
-#include "ui/wm/public/activation_change_observer.h"
namespace aura {
class Window;
-
-namespace client {
-class ActivationClient;
-}
}
namespace gfx {
@@ -39,12 +34,10 @@ class AppListViewDelegate;
class HomeCardLayoutManager;
class HomeCardView;
-class ATHENA_EXPORT HomeCardImpl
- : public HomeCard,
- public AcceleratorHandler,
- public HomeCardGestureManager::Delegate,
- public WindowManagerObserver,
- public aura::client::ActivationChangeObserver {
+class ATHENA_EXPORT HomeCardImpl : public HomeCard,
+ public AcceleratorHandler,
+ public HomeCardGestureManager::Delegate,
+ public WindowManagerObserver {
public:
HomeCardImpl(scoped_ptr<AppModelBuilder> model_builder,
scoped_ptr<SearchControllerFactory> search_factory);
@@ -85,10 +78,6 @@ class ATHENA_EXPORT HomeCardImpl
virtual void OnSplitViewModeEnter() override;
virtual void OnSplitViewModeExit() override;
- // aura::client::ActivationChangeObserver:
- virtual void OnWindowActivated(aura::Window* gained_active,
- aura::Window* lost_active) override;
-
scoped_ptr<AppModelBuilder> model_builder_;
scoped_ptr<SearchControllerFactory> search_factory_;
@@ -102,7 +91,6 @@ class ATHENA_EXPORT HomeCardImpl
HomeCardView* home_card_view_;
scoped_ptr<AppListViewDelegate> view_delegate_;
HomeCardLayoutManager* layout_manager_;
- aura::client::ActivationClient* activation_client_; // Not owned
scoped_ptr<ui::LayerOwner> minimized_home_;
DISALLOW_COPY_AND_ASSIGN(HomeCardImpl);
« no previous file with comments | « no previous file | athena/home/home_card_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698