| Index: mojo/services/view_manager/public/cpp/view_manager.h
|
| diff --git a/mojo/services/public/cpp/view_manager/view_manager.h b/mojo/services/view_manager/public/cpp/view_manager.h
|
| similarity index 68%
|
| rename from mojo/services/public/cpp/view_manager/view_manager.h
|
| rename to mojo/services/view_manager/public/cpp/view_manager.h
|
| index 25862459d42f1e25ad0939f967eacb1a21c07184..4e0ebccc8f280d4d5470767f3d64e726946ad579 100644
|
| --- a/mojo/services/public/cpp/view_manager/view_manager.h
|
| +++ b/mojo/services/view_manager/public/cpp/view_manager.h
|
| @@ -2,13 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
|
| -#define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
|
| +#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
|
| +#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
|
|
|
| #include <string>
|
| -#include <vector>
|
|
|
| -#include "mojo/services/public/cpp/view_manager/types.h"
|
| +#include "mojo/services/view_manager/public/cpp/types.h"
|
|
|
| namespace mojo {
|
| class View;
|
| @@ -22,16 +21,20 @@ class ViewManager {
|
| // Returns the URL of the application that embedded this application.
|
| virtual const std::string& GetEmbedderURL() const = 0;
|
|
|
| - // Returns all root views known to this connection.
|
| - virtual const std::vector<View*>& GetRoots() const = 0;
|
| + // Returns the root of this connection.
|
| + virtual View* GetRoot() = 0;
|
|
|
| // Returns a View known to this connection.
|
| virtual View* GetViewById(Id id) = 0;
|
|
|
| + // Returns the focused view; null if focus is not yet known or another app is
|
| + // focused.
|
| + virtual View* GetFocusedView() = 0;
|
| +
|
| protected:
|
| virtual ~ViewManager() {}
|
| };
|
|
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
|
| +#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
|
|
|