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

Unified Diff: ui/views/widget/desktop_aura/desktop_activation_client.h

Issue 11299219: Rework FocusManager as FocusClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_activation_client.h
===================================================================
--- ui/views/widget/desktop_aura/desktop_activation_client.h (revision 169818)
+++ ui/views/widget/desktop_aura/desktop_activation_client.h (working copy)
@@ -9,8 +9,8 @@
#include "base/observer_list.h"
#include "base/scoped_observer.h"
#include "ui/aura/client/activation_client.h"
+#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/env_observer.h"
-#include "ui/aura/focus_change_observer.h"
#include "ui/aura/root_window_observer.h"
#include "ui/aura/window_observer.h"
#include "ui/views/views_export.h"
@@ -32,7 +32,7 @@
class VIEWS_EXPORT DesktopActivationClient
: public aura::client::ActivationClient,
public aura::WindowObserver,
- public aura::FocusChangeObserver {
+ public aura::client::FocusChangeObserver {
public:
explicit DesktopActivationClient(aura::RootWindow* root_window);
virtual ~DesktopActivationClient();
@@ -52,7 +52,7 @@
// Overridden from aura::WindowObserver:
virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
- // Overridden from aura::FocusChangeObserver:
+ // Overridden from aura::client::FocusChangeObserver:
virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
private:
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698