| Index: services/window_manager/focus_controller_observer.h
|
| diff --git a/services/window_manager/focus_controller_observer.h b/services/window_manager/focus_controller_observer.h
|
| index 658c3c9137cc9b751f32d21a187a5d83a1998c79..ea0d57ed94c00b83b4bcc5e9bb10a001f724616a 100644
|
| --- a/services/window_manager/focus_controller_observer.h
|
| +++ b/services/window_manager/focus_controller_observer.h
|
| @@ -6,8 +6,10 @@
|
| #define SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
|
|
|
| namespace mojo {
|
| -
|
| class View;
|
| +}
|
| +
|
| +namespace window_manager {
|
|
|
| class FocusControllerObserver {
|
| public:
|
| @@ -15,22 +17,23 @@ class FocusControllerObserver {
|
| // (|active| is null in this case.) |old_active| refers to the
|
| // previous active view or null if there was no previously active
|
| // view.
|
| - virtual void OnViewActivated(View* gained_active,
|
| - View* lost_active) = 0;
|
| + virtual void OnViewActivated(mojo::View* gained_active,
|
| + mojo::View* lost_active) = 0;
|
|
|
| // Called when focus moves from |lost_focus| to |gained_focus|.
|
| - virtual void OnViewFocused(View* gained_focus, View* lost_focus) = 0;
|
| + virtual void OnViewFocused(mojo::View* gained_focus,
|
| + mojo::View* lost_focus) = 0;
|
|
|
| // Called when during view activation the currently active view is
|
| // selected for activation. This can happen when a view requested for
|
| // activation cannot be activated because a system modal view is active.
|
| - virtual void OnAttemptToReactivateView(View* request_active,
|
| - View* actual_active) {}
|
| + virtual void OnAttemptToReactivateView(mojo::View* request_active,
|
| + mojo::View* actual_active) {}
|
|
|
| protected:
|
| virtual ~FocusControllerObserver() {}
|
| };
|
|
|
| -} // namespace mojo
|
| +} // namespace window_manager
|
|
|
| #endif // SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_OBSERVER_H_
|
|
|