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

Side by Side Diff: ui/views/corewm/focus_controller.h

Issue 11418224: Eliminates all ash dependencies from WindowModalityController. (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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/test/test_activation_client.cc ('k') | ui/views/corewm/focus_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 5 #ifndef UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
6 #define UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 6 #define UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/aura/client/activation_client.h" 9 #include "ui/aura/client/activation_client.h"
10 #include "ui/aura/env_observer.h" 10 #include "ui/aura/env_observer.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 private: 50 private:
51 // Overridden from aura::ActivationClient: 51 // Overridden from aura::ActivationClient:
52 virtual void AddObserver( 52 virtual void AddObserver(
53 aura::client::ActivationChangeObserver* observer) OVERRIDE; 53 aura::client::ActivationChangeObserver* observer) OVERRIDE;
54 virtual void RemoveObserver( 54 virtual void RemoveObserver(
55 aura::client::ActivationChangeObserver* observer) OVERRIDE; 55 aura::client::ActivationChangeObserver* observer) OVERRIDE;
56 virtual void ActivateWindow(aura::Window* window) OVERRIDE; 56 virtual void ActivateWindow(aura::Window* window) OVERRIDE;
57 virtual void DeactivateWindow(aura::Window* window) OVERRIDE; 57 virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
58 virtual aura::Window* GetActiveWindow() OVERRIDE; 58 virtual aura::Window* GetActiveWindow() OVERRIDE;
59 virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE;
59 virtual bool OnWillFocusWindow(aura::Window* window, 60 virtual bool OnWillFocusWindow(aura::Window* window,
60 const ui::Event* event) OVERRIDE; 61 const ui::Event* event) OVERRIDE;
61 virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; 62 virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
62 63
63 // Overridden from ui::EventHandler: 64 // Overridden from ui::EventHandler:
64 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 65 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
65 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 66 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
66 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 67 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
67 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 68 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
68 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 69 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 104
104 scoped_ptr<FocusRules> rules_; 105 scoped_ptr<FocusRules> rules_;
105 106
106 DISALLOW_COPY_AND_ASSIGN(FocusController); 107 DISALLOW_COPY_AND_ASSIGN(FocusController);
107 }; 108 };
108 109
109 } // namespace corewm 110 } // namespace corewm
110 } // namespace views 111 } // namespace views
111 112
112 #endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 113 #endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/aura/test/test_activation_client.cc ('k') | ui/views/corewm/focus_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698