athena/content/app_activity.cc - Issue 614283002: Remove Activity dependency from content_proxy

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: athena/content/app_activity.cc

Issue 614283002: Remove Activity dependency from content_proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 unified diff | Download patch

« no previous file with comments | « no previous file | athena/content/content_proxy.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "athena/content/app_activity.h"	5 #include "athena/content/app_activity.h"

6	6

7 #include "athena/activity/public/activity_manager.h"	7 #include "athena/activity/public/activity_manager.h"

8 #include "athena/content/app_activity_registry.h"	8 #include "athena/content/app_activity_registry.h"

9 #include "athena/content/content_proxy.h"	9 #include "athena/content/content_proxy.h"

10 #include "athena/content/public/app_registry.h"	10 #include "athena/content/public/app_registry.h"

(...skipping 200 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
211 // Register the activity.	211 // Register the activity.

212 app_activity_registry_->RegisterAppActivity(this);	212 app_activity_registry_->RegisterAppActivity(this);

213 }	213 }

214	214

215 void AppActivity::HideContentProxy() {	215 void AppActivity::HideContentProxy() {

216 content_proxy_.reset();	216 content_proxy_.reset();

217 }	217 }

218	218

219 void AppActivity::ShowContentProxy() {	219 void AppActivity::ShowContentProxy() {

220 if (!content_proxy_.get() && web_view_)	220 if (!content_proxy_.get() && web_view_)

221 content_proxy_.reset(new ContentProxy(web_view_, this));	221 content_proxy_.reset(new ContentProxy(web_view_));

222 }	222 }

223	223

224 } // namespace athena	224 } // namespace athena

OLD	NEW