OLD | NEW |
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/macros.h" |
11 #include "base/memory/singleton.h" | 12 #include "base/memory/singleton.h" |
12 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
13 #include "chrome/browser/apps/app_window_registry_util.h" | 14 #include "chrome/browser/apps/app_window_registry_util.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/lifetime/application_lifetime.h" | 16 #include "chrome/browser/lifetime/application_lifetime.h" |
16 #include "chrome/browser/ui/app_list/app_list_service.h" | 17 #include "chrome/browser/ui/app_list/app_list_service.h" |
17 #include "content/public/browser/notification_observer.h" | 18 #include "content/public/browser/notification_observer.h" |
18 #include "content/public/browser/notification_registrar.h" | 19 #include "content/public/browser/notification_registrar.h" |
19 #include "content/public/browser/notification_service.h" | 20 #include "content/public/browser/notification_service.h" |
20 | 21 |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 void AppShimHandler::MaybeTerminate() { | 148 void AppShimHandler::MaybeTerminate() { |
148 AppShimHandlerRegistry::GetInstance()->MaybeTerminate(); | 149 AppShimHandlerRegistry::GetInstance()->MaybeTerminate(); |
149 } | 150 } |
150 | 151 |
151 // static | 152 // static |
152 bool AppShimHandler::ShouldRestoreSession() { | 153 bool AppShimHandler::ShouldRestoreSession() { |
153 return AppShimHandlerRegistry::GetInstance()->ShouldRestoreSession(); | 154 return AppShimHandlerRegistry::GetInstance()->ShouldRestoreSession(); |
154 } | 155 } |
155 | 156 |
156 } // namespace apps | 157 } // namespace apps |
OLD | NEW |