X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fapps%2Fapp_shim%2Fapp_shim_handler_mac.cc;h=cfbf4ffe1ec426795d681bf965b30a87bea3aeca;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=f50acdbad2c65f73ec4413b531345065611f480e;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/apps/app_shim/app_shim_handler_mac.cc b/src/apps/app_shim/app_shim_handler_mac.cc index f50acdb..cfbf4ff 100644 --- a/src/apps/app_shim/app_shim_handler_mac.cc +++ b/src/apps/app_shim/app_shim_handler_mac.cc @@ -6,7 +6,7 @@ #include -#include "apps/shell_window_registry.h" +#include "apps/app_window_registry.h" #include "base/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" @@ -22,11 +22,12 @@ namespace apps { namespace { -void TerminateIfNoShellWindows() { - bool shell_windows_left = - apps::ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(0); - if (!shell_windows_left && !AppListService::Get( - chrome::HOST_DESKTOP_TYPE_NATIVE)->IsAppListVisible()) { +void TerminateIfNoAppWindows() { + bool app_windows_left = + apps::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(0); + if (!app_windows_left && + !AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE) + ->IsAppListVisible()) { chrome::AttemptExit(); } } @@ -61,11 +62,10 @@ class AppShimHandlerRegistry : public content::NotificationObserver { void MaybeTerminate() { if (!browser_opened_ever_) { - // Post this to give ShellWindows a chance to remove themselves from the + // Post this to give AppWindows a chance to remove themselves from the // registry. base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&TerminateIfNoShellWindows)); + FROM_HERE, base::Bind(&TerminateIfNoAppWindows)); } }