Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1655)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/content/app_activity.cc

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/app_activity.h ('k') | athena/content/content_activity_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/app_activity.cc
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc
index 3a4cb693cc738d920c21e0b6bfa4c4e9658281b7..c90daffa625e253e3498cdb11b9dd0ea6e9de7ca 100644
--- a/athena/content/app_activity.cc
+++ b/athena/content/app_activity.cc
@@ -4,15 +4,15 @@
#include "athena/content/app_activity.h"
-#include "apps/shell/browser/shell_app_window.h"
#include "athena/activity/public/activity_manager.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/shell/browser/shell_app_window.h"
#include "ui/views/controls/webview/webview.h"
namespace athena {
// TODO(mukai): specifies the same accelerators of WebActivity.
-AppActivity::AppActivity(apps::ShellAppWindow* app_window)
+AppActivity::AppActivity(extensions::ShellAppWindow* app_window)
: app_window_(app_window),
web_view_(NULL),
current_state_(ACTIVITY_UNLOADED) {
« no previous file with comments | « athena/content/app_activity.h ('k') | athena/content/content_activity_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698