diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 14:09:48 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 14:09:48 +0000 |
| commit | 24c81d69598fce9558b6a1ae2cd802ad6f7e371a (patch) | |
| tree | fa8e85f88af52a3f26ed1e4a5f5bd303ed12c142 /apps/app_load_service.cc | |
| parent | dab407b5264bee7800f9c6f4d0c8cc2493797d91 (diff) | |
| download | chromium_src-24c81d69598fce9558b6a1ae2cd802ad6f7e371a.zip chromium_src-24c81d69598fce9558b6a1ae2cd802ad6f7e371a.tar.gz chromium_src-24c81d69598fce9558b6a1ae2cd802ad6f7e371a.tar.bz2 | |
Move platform_app_launcher to apps
chrome/browser/extensions/platform_app_launcher.* -> apps/launcher.*
TBR=yoz@chromium.org, willchan@chromium.ogt, satorux@chromium.org
TBR for simple refactors:
yoz for extensions
willchan for new dependency on net/base
satorux for new dependency on chrome/browser/chromeos/drive
BUG=159366
TEST=Ensure launching apps in Windows 8 while chrome is running in
single window mode still prompts to run chrome in desktop mode.
Review URL: https://chromiumcodereview.appspot.com/22536002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_load_service.cc')
| -rw-r--r-- | apps/app_load_service.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc index 982822e..d2423c0 100644 --- a/apps/app_load_service.cc +++ b/apps/app_load_service.cc @@ -5,12 +5,12 @@ #include "apps/app_load_service.h" #include "apps/app_load_service_factory.h" +#include "apps/launcher.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/platform_app_launcher.h" #include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" @@ -89,13 +89,13 @@ void AppLoadService::Observe(int type, switch (it->second.action_type) { case LAUNCH: - extensions::LaunchPlatformApp(profile_, extension); + LaunchPlatformApp(profile_, extension); break; case RESTART: - extensions::RestartPlatformApp(profile_, extension); + RestartPlatformApp(profile_, extension); break; case LAUNCH_WITH_COMMAND_LINE: - extensions::LaunchPlatformAppWithCommandLine( + LaunchPlatformAppWithCommandLine( profile_, extension, &it->second.command_line, it->second.current_dir); break; |