components/view_manager/public/cpp/view.h - Issue 1314953002: Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/view_manager/public/cpp/view.h

Issue 1314953002: Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 4 months 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 | « components/view_manager/public/cpp/tests/view_manager_test_base.cc ('k') | components/view_manager/public/cpp/view_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/view_manager/public/cpp/view.h

diff --git a/components/view_manager/public/cpp/view.h b/components/view_manager/public/cpp/view.h

index 3d6ac527c36132dfea7f4d66a002d4205ccef58f..a2393c19577073a2be3503893d9830f34123ec12 100644

--- a/components/view_manager/public/cpp/view.h

+++ b/components/view_manager/public/cpp/view.h

@@ -11,8 +11,8 @@

#include "base/observer_list.h"

#include "components/view_manager/public/cpp/types.h"

#include "components/view_manager/public/interfaces/surface_id.mojom.h"

-#include "components/view_manager/public/interfaces/view_manager.mojom.h"

#include "components/view_manager/public/interfaces/view_manager_constants.mojom.h"

+#include "components/view_manager/public/interfaces/view_tree.mojom.h"

#include "mojo/application/public/interfaces/service_provider.mojom.h"

#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"

#include "third_party/mojo/src/mojo/public/cpp/system/macros.h"

@@ -132,8 +132,8 @@ class View {

void SetFocus();

bool HasFocus() const;

- // Embedding. See view_manager.mojom for details.

- void Embed(ViewManagerClientPtr client);

+ // Embedding. See view_tree.mojom for details.

+ void Embed(ViewTreeClientPtr client);

void EmbedAllowingReembed(mojo::URLRequestPtr request);

protected:

@@ -143,7 +143,7 @@ class View {

private:

friend class ViewPrivate;

- friend class ViewManagerClientImpl;

+ friend class ViewTreeClientImpl;

View(ViewManager* manager, Id id);