| Index: services/window_manager/focus_rules.h
|
| diff --git a/services/window_manager/focus_rules.h b/services/window_manager/focus_rules.h
|
| index 83fd1d59bdb58f13b2ad5104da2fb17fe20c910d..e409cbb590688ace6fe756bce41bdf20940a0893 100644
|
| --- a/services/window_manager/focus_rules.h
|
| +++ b/services/window_manager/focus_rules.h
|
| @@ -8,7 +8,7 @@
|
| #include "mojo/services/public/cpp/view_manager/types.h"
|
| #include "mojo/services/public/cpp/view_manager/view.h"
|
|
|
| -namespace mojo {
|
| +namespace window_manager {
|
|
|
| // Implemented by an object that establishes the rules about what can be
|
| // focused or activated.
|
| @@ -17,25 +17,25 @@ class FocusRules {
|
| virtual ~FocusRules() {}
|
|
|
| // Returns true if the children of |window| can be activated.
|
| - virtual bool SupportsChildActivation(View* window) const = 0;
|
| + virtual bool SupportsChildActivation(mojo::View* window) const = 0;
|
|
|
| // Returns true if |view| is a toplevel view. Whether or not a view
|
| // is considered toplevel is determined by a similar set of rules that
|
| // govern activation and focus. Not all toplevel views are activatable,
|
| // call CanActivateView() to determine if a view can be activated.
|
| - virtual bool IsToplevelView(View* view) const = 0;
|
| + virtual bool IsToplevelView(mojo::View* view) const = 0;
|
| // Returns true if |view| can be activated or focused.
|
| - virtual bool CanActivateView(View* view) const = 0;
|
| + virtual bool CanActivateView(mojo::View* view) const = 0;
|
| // For CanFocusView(), null is supported, because null is a valid focusable
|
| // view (in the case of clearing focus).
|
| - virtual bool CanFocusView(View* view) const = 0;
|
| + virtual bool CanFocusView(mojo::View* view) const = 0;
|
|
|
| // Returns the toplevel view containing |view|. Not all toplevel views
|
| // are activatable, call GetActivatableView() instead to return the
|
| // activatable view, which might be in a different hierarchy.
|
| // Will return null if |view| is not contained by a view considered to be
|
| // a toplevel view.
|
| - virtual View* GetToplevelView(View* view) const = 0;
|
| + virtual mojo::View* GetToplevelView(mojo::View* view) const = 0;
|
| // Returns the activatable or focusable view given an attempt to activate or
|
| // focus |view|. Some possible scenarios (not intended to be exhaustive):
|
| // - |view| is a child of a non-focusable view and so focus must be set
|
| @@ -45,8 +45,8 @@ class FocusRules {
|
| // transient being activated instead.
|
| // These methods may return null if they are unable to find an activatable
|
| // or focusable view given |view|.
|
| - virtual View* GetActivatableView(View* view) const = 0;
|
| - virtual View* GetFocusableView(View* view) const = 0;
|
| + virtual mojo::View* GetActivatableView(mojo::View* view) const = 0;
|
| + virtual mojo::View* GetFocusableView(mojo::View* view) const = 0;
|
|
|
| // Returns the next view to activate in the event that |ignore| is no longer
|
| // activatable. This function is called when something is happening to
|
| @@ -57,9 +57,9 @@ class FocusRules {
|
| // - it is being destroyed.
|
| // - it is being explicitly deactivated.
|
| // |ignore| cannot be null.
|
| - virtual View* GetNextActivatableView(View* ignore) const = 0;
|
| + virtual mojo::View* GetNextActivatableView(mojo::View* ignore) const = 0;
|
| };
|
|
|
| -} // namespace mojo
|
| +} // namespace window_manager
|
|
|
| #endif // SERVICES_WINDOW_MANAGER_FOCUS_RULES_H_
|
|
|