| Index: chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| index 6869b9beddbe939d876588c47073ead18d656916..5f8b64596940702898ba9911926abb9a46b84aa7 100644
|
| --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
|
|
|
| -#include "apps/app_window.h"
|
| -#include "apps/app_window_registry.h"
|
| #include "base/command_line.h"
|
| #include "base/i18n/number_formatting.h"
|
| #include "base/prefs/pref_registry_simple.h"
|
| @@ -22,6 +20,8 @@
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "chrome/grit/google_chrome_strings.h"
|
| +#include "extensions/browser/app_window/app_window.h"
|
| +#include "extensions/browser/app_window/app_window_registry.h"
|
| #include "extensions/browser/app_window/native_app_window.h"
|
| #include "extensions/common/extension.h"
|
| #include "grit/chrome_unscaled_resources.h"
|
| @@ -86,7 +86,7 @@ void QuitWithAppsController::Click() {
|
| void QuitWithAppsController::ButtonClick(int button_index) {
|
| g_browser_process->notification_ui_manager()->CancelById(id());
|
| if (button_index == kQuitAllAppsButtonIndex) {
|
| - apps::AppWindowRegistry::CloseAllAppWindows();
|
| + extensions::AppWindowRegistry::CloseAllAppWindows();
|
| } else if (button_index == kDontShowAgainButtonIndex) {
|
| g_browser_process->local_state()->SetBoolean(
|
| prefs::kNotifyWhenAppsKeepChromeAlive, false);
|
| @@ -113,7 +113,7 @@ bool QuitWithAppsController::ShouldQuit() {
|
|
|
| // Quit immediately if there are no windows or the confirmation has been
|
| // suppressed.
|
| - if (!apps::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(0))
|
| + if (!extensions::AppWindowRegistry::IsAppWindowRegisteredInAnyProfile(0))
|
| return true;
|
|
|
| // If there are browser windows, and this notification has been suppressed for
|
|
|