mojo/shell/context.h - Issue 404913002: Break dependency of native_viewport_service on mojo::shell::Context

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: mojo/shell/context.h

Issue 404913002: Break dependency of native_viewport_service on mojo::shell::Context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move call to GetApplicationContext() to native_viewport_android Created 6 years, 5 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:

Index: mojo/shell/context.h

diff --git a/mojo/shell/context.h b/mojo/shell/context.h

index 2173377bec78e9ec574c3bbeb05653ec02724297..f8970a54cf113dc1b1c015368c9490f58931d8ff 100644

--- a/mojo/shell/context.h

+++ b/mojo/shell/context.h

@@ -36,8 +36,6 @@ class Context {

MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }

#if defined(OS_ANDROID)

- jobject activity() const { return activity_.obj(); }

- void set_activity(jobject activity) { activity_.Reset(NULL, activity); }

base::MessageLoop* ui_loop() const { return ui_loop_; }

void set_ui_loop(base::MessageLoop* ui_loop) { ui_loop_ = ui_loop; }

#endif // defined(OS_ANDROID)

@@ -50,7 +48,6 @@ class Context {

MojoURLResolver mojo_url_resolver_;

scoped_ptr<Spy> spy_;

#if defined(OS_ANDROID)

- base::android::ScopedJavaGlobalRef<jobject> activity_;

base::MessageLoop* ui_loop_;

#endif // defined(OS_ANDROID)

« no previous file with comments | « mojo/shell/android/mojo_main.cc ('k') | mojo/shell/context.cc » ('j') | no next file with comments »