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

Unified Diff: ash/wm/ash_activation_controller.h

Issue 11594004: Revert 173417 - Broke on win_aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | « ash/launcher/launcher_unittest.cc ('k') | ash/wm/ash_activation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_activation_controller.h
===================================================================
--- ash/wm/ash_activation_controller.h (revision 173420)
+++ ash/wm/ash_activation_controller.h (working copy)
@@ -5,7 +5,6 @@
#ifndef ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
#define ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
-#include "ash/ash_export.h"
#include "ash/wm/activation_controller_delegate.h"
#include "base/compiler_specific.h"
#include "base/basictypes.h"
@@ -13,7 +12,7 @@
namespace ash {
namespace internal {
-class ASH_EXPORT AshActivationController : public ActivationControllerDelegate {
+class AshActivationController : public ActivationControllerDelegate {
public:
AshActivationController();
virtual ~AshActivationController();
@@ -23,11 +22,6 @@
virtual aura::Window* WillActivateWindow(aura::Window* window) OVERRIDE;
virtual aura::Window* WillFocusWindow(aura::Window* window) OVERRIDE;
- // Returns a handle to the launcher on the active root window which will
- // be activated as fallback. Also notifies the launcher, so it can return
- // true from Launcher::CanActivate().
- aura::Window* PrepareToActivateLauncher();
-
DISALLOW_COPY_AND_ASSIGN(AshActivationController);
};
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/wm/ash_activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698