diff options
| author | hashimoto <hashimoto@chromium.org> | 2014-08-29 02:46:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 09:47:52 +0000 |
| commit | ad3c6870f41f0b057697ea8dec59cc8cf8108745 (patch) | |
| tree | 285a8312794c1fad48a95385d3c8d1de73af398b /athena/test | |
| parent | fe5226eee8343a325c6b4d5d0e75f94c96c4616e (diff) | |
| download | chromium_src-ad3c6870f41f0b057697ea8dec59cc8cf8108745.zip chromium_src-ad3c6870f41f0b057697ea8dec59cc8cf8108745.tar.gz chromium_src-ad3c6870f41f0b057697ea8dec59cc8cf8108745.tar.bz2 | |
Move AppWindow to extensions
Move AppWindow, AppWindowRegistry and AppsClient from apps/ to extensions/browser/app_window
Change the namespace from apps to extensions.
Fix GYP and DEPS.
BUG=403726
TBR=sky@chromium.org for include and namespace changes
Review URL: https://codereview.chromium.org/494033002
Cr-Commit-Position: refs/heads/master@{#292599}
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/sample_activity_factory.cc | 2 | ||||
| -rw-r--r-- | athena/test/sample_activity_factory.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc index b043e17..55bddeb 100644 --- a/athena/test/sample_activity_factory.cc +++ b/athena/test/sample_activity_factory.cc @@ -44,7 +44,7 @@ Activity* SampleActivityFactory::CreateAppActivity( } Activity* SampleActivityFactory::CreateAppActivity( - apps::AppWindow* app_window) { + extensions::AppWindow* app_window) { return new SampleActivity( kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); } diff --git a/athena/test/sample_activity_factory.h b/athena/test/sample_activity_factory.h index 5dd9e1a..0002daa 100644 --- a/athena/test/sample_activity_factory.h +++ b/athena/test/sample_activity_factory.h @@ -21,7 +21,8 @@ class SampleActivityFactory : public ActivityFactory { const GURL& url) OVERRIDE; virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window, const std::string& app_id) OVERRIDE; - virtual Activity* CreateAppActivity(apps::AppWindow* app_window) OVERRIDE; + virtual Activity* CreateAppActivity( + extensions::AppWindow* app_window) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(SampleActivityFactory); |