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

Unified Diff: ui/aura/desktop/desktop_activation_client.h

Issue 11062004: Fix crash in a few of the tests in content_browsertests on Linux. The problem was that DesktopActiv… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: actually need to use test compositor on bots Created 8 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
Index: ui/aura/desktop/desktop_activation_client.h
===================================================================
--- ui/aura/desktop/desktop_activation_client.h (revision 159993)
+++ ui/aura/desktop/desktop_activation_client.h (working copy)
@@ -26,7 +26,6 @@
// objects.
class AURA_EXPORT DesktopActivationClient : public client::ActivationClient,
public WindowObserver,
- public EnvObserver,
public FocusChangeObserver {
public:
explicit DesktopActivationClient(FocusManager* focus_manager);
@@ -46,9 +45,6 @@
// Overridden from aura::WindowObserver:
virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
- // Overridden from aura::EnvObserver:
- virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
-
// Overridden from aura::FocusChangeObserver:
virtual void OnWindowFocused(aura::Window* window) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698