third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h - Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

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: third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: use run_renderer_in_process() Created 5 years, 10 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 | « third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h ('k') | third_party/mojo_services/src/view_manager/public/cpp/view_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h

diff --git a/third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h

index 197659885c0aa968090b426cc33cd1a07fd1e0f1..de7b84bef5d75d8b76146a571b85b47b47b1962f 100644

--- a/third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h

+++ b/third_party/mojo_services/src/view_manager/public/cpp/view_manager_context.h

@@ -8,9 +8,8 @@

#include <string>

#include <vector>

-#include "base/bind.h"

-#include "base/memory/scoped_ptr.h"

#include "mojo/public/cpp/application/service_provider_impl.h"

+#include "mojo/public/cpp/system/macros.h"

namespace mojo {

class ApplicationImpl;

@@ -37,7 +36,7 @@ class ViewManagerContext {

private:

class InternalState;

- scoped_ptr<InternalState> state_;

+ InternalState* state_;

MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerContext);

};