diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-22 19:53:59 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-22 19:53:59 +0000 |
| commit | 6b67ec749d2a0d21f219125da55f7a3347710984 (patch) | |
| tree | 6a44366a027dfca121b56312765da276b9289087 /apps/app_window.cc | |
| parent | 14abf713e6cd20f402aa253d252a2d59d66dc40c (diff) | |
| download | chromium_src-6b67ec749d2a0d21f219125da55f7a3347710984.zip chromium_src-6b67ec749d2a0d21f219125da55f7a3347710984.tar.gz chromium_src-6b67ec749d2a0d21f219125da55f7a3347710984.tar.bz2 | |
Add support for chrome.app.window.create() to app_shell
* Introduce an AppsClient for app_shell
* Create an AppsClient for tests
* Introduce ShellAppWindowDelegate whose sole purpose is to create a NativeAppWindowViews for windows in app_shell
* Extract Chrome-specific code from apps/app_window.cc
This is part 2 of 2 and depends on https://codereview.chromium.org/171003004/
BUG=343174
TEST=browser_tests PlatformApp*
TBR=sky@chromium.org for chrome/test/base/testing_browser_process.cc
Review URL: https://codereview.chromium.org/166833004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_window.cc')
| -rw-r--r-- | apps/app_window.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_window.cc b/apps/app_window.cc index 1f0c945..1c6d286 100644 --- a/apps/app_window.cc +++ b/apps/app_window.cc @@ -6,6 +6,7 @@ #include "apps/app_window_geometry_cache.h" #include "apps/app_window_registry.h" +#include "apps/apps_client.h" #include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "base/strings/string_util.h" @@ -14,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/extensions/suggest_permission_util.h" -#include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" @@ -232,7 +232,7 @@ void AppWindow::Init(const GURL& url, } // Prevent the browser process from shutting down while this window is open. - chrome::StartKeepAlive(); + AppsClient::Get()->StartKeepAlive(); UpdateExtensionAppIcon(); @@ -245,7 +245,7 @@ AppWindow::~AppWindow() { registrar_.RemoveAll(); // Remove shutdown prevention. - chrome::EndKeepAlive(); + AppsClient::Get()->EndKeepAlive(); } void AppWindow::RequestMediaAccessPermission( |