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

Side by Side Diff: chrome/browser/apps/app_shim/app_shim_handler_mac.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h" 5 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "chrome/browser/apps/app_window_registry_util.h" 13 #include "chrome/browser/apps/app_window_registry_util.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/lifetime/application_lifetime.h" 15 #include "chrome/browser/lifetime/application_lifetime.h"
16 #include "chrome/browser/ui/app_list/app_list_service.h" 16 #include "chrome/browser/ui/app_list/app_list_service.h"
17 #include "content/public/browser/notification_observer.h" 17 #include "content/public/browser/notification_observer.h"
18 #include "content/public/browser/notification_registrar.h" 18 #include "content/public/browser/notification_registrar.h"
19 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
20 20
21 namespace apps { 21 namespace apps {
22 22
23 namespace { 23 namespace {
24 24
25 void TerminateIfNoAppWindows() { 25 void TerminateIfNoAppWindows() {
26 bool app_windows_left = 26 bool app_windows_left =
27 AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0); 27 AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0);
28 if (!app_windows_left && 28 if (!app_windows_left &&
29 !AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE) 29 !AppListService::Get(ui::HOST_DESKTOP_TYPE_NATIVE)->IsAppListVisible()) {
30 ->IsAppListVisible()) {
31 chrome::AttemptExit(); 30 chrome::AttemptExit();
32 } 31 }
33 } 32 }
34 33
35 class AppShimHandlerRegistry : public content::NotificationObserver { 34 class AppShimHandlerRegistry : public content::NotificationObserver {
36 public: 35 public:
37 static AppShimHandlerRegistry* GetInstance() { 36 static AppShimHandlerRegistry* GetInstance() {
38 return base::Singleton< 37 return base::Singleton<
39 AppShimHandlerRegistry, 38 AppShimHandlerRegistry,
40 base::LeakySingletonTraits<AppShimHandlerRegistry>>::get(); 39 base::LeakySingletonTraits<AppShimHandlerRegistry>>::get();
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 void AppShimHandler::MaybeTerminate() { 146 void AppShimHandler::MaybeTerminate() {
148 AppShimHandlerRegistry::GetInstance()->MaybeTerminate(); 147 AppShimHandlerRegistry::GetInstance()->MaybeTerminate();
149 } 148 }
150 149
151 // static 150 // static
152 bool AppShimHandler::ShouldRestoreSession() { 151 bool AppShimHandler::ShouldRestoreSession() {
153 return AppShimHandlerRegistry::GetInstance()->ShouldRestoreSession(); 152 return AppShimHandlerRegistry::GetInstance()->ShouldRestoreSession();
154 } 153 }
155 154
156 } // namespace apps 155 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698