athena/content/app_activity.h - Issue 412713002: Move apps/shell to extensions/shell.

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: athena/content/app_activity.h

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 40% 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: athena/content/app_activity.h

diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h

index cfbe93d7fd538f7bba7b09dc8bc92bb39ae67245..4f6ef2b3d47ac45d05805aaf02fe053feea03930 100644

--- a/athena/content/app_activity.h

+++ b/athena/content/app_activity.h

@@ -10,7 +10,7 @@

#include "content/public/browser/web_contents_observer.h"

#include "ui/gfx/image/image_skia.h"

-namespace apps {

+namespace extensions {

class ShellAppWindow;

}

@@ -24,7 +24,7 @@ class AppActivity : public Activity,

public ActivityViewModel,

public content::WebContentsObserver {

public:

- explicit AppActivity(apps::ShellAppWindow* app_window);

+ explicit AppActivity(extensions::ShellAppWindow* app_window);

virtual ~AppActivity();

protected:

@@ -51,7 +51,7 @@ class AppActivity : public Activity,

const std::vector<content::FaviconURL>& candidates) OVERRIDE;

private:

- scoped_ptr<apps::ShellAppWindow> app_window_;

+ scoped_ptr<extensions::ShellAppWindow> app_window_;

views::WebView* web_view_;

// The current state for this activity.

« no previous file with comments | « athena/content/DEPS ('k') | athena/content/app_activity.cc » ('j') | no next file with comments »