| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import "chrome/browser/app_controller_mac.h" | 5 #import "chrome/browser/app_controller_mac.h" |
| 6 | 6 |
| 7 #include "apps/app_shim/extension_app_shim_handler_mac.h" | 7 #include "apps/app_shim/extension_app_shim_handler_mac.h" |
| 8 #include "apps/app_window_registry.h" | 8 #include "apps/app_window_registry.h" |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 #include "chrome/browser/ui/host_desktop.h" | 70 #include "chrome/browser/ui/host_desktop.h" |
| 71 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 71 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 72 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 72 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 73 #include "chrome/common/chrome_paths_internal.h" | 73 #include "chrome/common/chrome_paths_internal.h" |
| 74 #include "chrome/common/chrome_switches.h" | 74 #include "chrome/common/chrome_switches.h" |
| 75 #include "chrome/common/cloud_print/cloud_print_class_mac.h" | 75 #include "chrome/common/cloud_print/cloud_print_class_mac.h" |
| 76 #include "chrome/common/extensions/extension_constants.h" | 76 #include "chrome/common/extensions/extension_constants.h" |
| 77 #include "chrome/common/mac/app_mode_common.h" | 77 #include "chrome/common/mac/app_mode_common.h" |
| 78 #include "chrome/common/pref_names.h" | 78 #include "chrome/common/pref_names.h" |
| 79 #include "chrome/common/url_constants.h" | 79 #include "chrome/common/url_constants.h" |
| 80 #include "chrome/grit/chromium_strings.h" |
| 81 #include "chrome/grit/generated_resources.h" |
| 82 #include "components/signin/core/browser/signin_manager.h" |
| 80 #include "components/signin/core/common/profile_management_switches.h" | 83 #include "components/signin/core/common/profile_management_switches.h" |
| 81 #include "components/signin/core/browser/signin_manager.h" | |
| 82 #include "content/public/browser/browser_thread.h" | 84 #include "content/public/browser/browser_thread.h" |
| 83 #include "content/public/browser/download_manager.h" | 85 #include "content/public/browser/download_manager.h" |
| 84 #include "content/public/browser/notification_service.h" | 86 #include "content/public/browser/notification_service.h" |
| 85 #include "content/public/browser/notification_types.h" | 87 #include "content/public/browser/notification_types.h" |
| 86 #include "content/public/browser/plugin_service.h" | 88 #include "content/public/browser/plugin_service.h" |
| 87 #include "content/public/browser/user_metrics.h" | 89 #include "content/public/browser/user_metrics.h" |
| 88 #include "extensions/browser/extension_system.h" | 90 #include "extensions/browser/extension_system.h" |
| 89 #include "grit/chromium_strings.h" | |
| 90 #include "grit/generated_resources.h" | |
| 91 #include "net/base/filename_util.h" | 91 #include "net/base/filename_util.h" |
| 92 #include "ui/base/cocoa/focus_window_set.h" | 92 #include "ui/base/cocoa/focus_window_set.h" |
| 93 #include "ui/base/l10n/l10n_util.h" | 93 #include "ui/base/l10n/l10n_util.h" |
| 94 #include "ui/base/l10n/l10n_util_mac.h" | 94 #include "ui/base/l10n/l10n_util_mac.h" |
| 95 | 95 |
| 96 using base::UserMetricsAction; | 96 using base::UserMetricsAction; |
| 97 using content::BrowserContext; | 97 using content::BrowserContext; |
| 98 using content::BrowserThread; | 98 using content::BrowserThread; |
| 99 using content::DownloadManager; | 99 using content::DownloadManager; |
| 100 | 100 |
| (...skipping 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1580 | 1580 |
| 1581 //--------------------------------------------------------------------------- | 1581 //--------------------------------------------------------------------------- |
| 1582 | 1582 |
| 1583 namespace app_controller_mac { | 1583 namespace app_controller_mac { |
| 1584 | 1584 |
| 1585 bool IsOpeningNewWindow() { | 1585 bool IsOpeningNewWindow() { |
| 1586 return g_is_opening_new_window; | 1586 return g_is_opening_new_window; |
| 1587 } | 1587 } |
| 1588 | 1588 |
| 1589 } // namespace app_controller_mac | 1589 } // namespace app_controller_mac |
| OLD | NEW |