| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/l10n_util_mac.h" | 8 #include "app/l10n_util_mac.h" |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" | 45 #import "chrome/browser/ui/cocoa/import_settings_dialog.h" |
| 46 #import "chrome/browser/ui/cocoa/preferences_window_controller.h" | 46 #import "chrome/browser/ui/cocoa/preferences_window_controller.h" |
| 47 #import "chrome/browser/ui/cocoa/tab_strip_controller.h" | 47 #import "chrome/browser/ui/cocoa/tab_strip_controller.h" |
| 48 #import "chrome/browser/ui/cocoa/tab_window_controller.h" | 48 #import "chrome/browser/ui/cocoa/tab_window_controller.h" |
| 49 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 49 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
| 50 #include "chrome/browser/ui/options/options_window.h" | 50 #include "chrome/browser/ui/options/options_window.h" |
| 51 #include "chrome/common/app_mode_common_mac.h" | 51 #include "chrome/common/app_mode_common_mac.h" |
| 52 #include "chrome/common/chrome_paths_internal.h" | 52 #include "chrome/common/chrome_paths_internal.h" |
| 53 #include "chrome/common/chrome_switches.h" | 53 #include "chrome/common/chrome_switches.h" |
| 54 #include "chrome/common/notification_service.h" | 54 #include "chrome/common/notification_service.h" |
| 55 #include "chrome/common/pref_names.h" | |
| 56 #include "chrome/common/url_constants.h" | 55 #include "chrome/common/url_constants.h" |
| 57 #include "grit/chromium_strings.h" | 56 #include "grit/chromium_strings.h" |
| 58 #include "grit/generated_resources.h" | 57 #include "grit/generated_resources.h" |
| 59 #include "net/base/net_util.h" | 58 #include "net/base/net_util.h" |
| 60 | 59 |
| 61 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help | 60 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help |
| 62 // menu. Provide the declaration so it can be called below when building with | 61 // menu. Provide the declaration so it can be called below when building with |
| 63 // the 10.5 SDK. | 62 // the 10.5 SDK. |
| 64 #if !defined(MAC_OS_X_VERSION_10_6) || \ | 63 #if !defined(MAC_OS_X_VERSION_10_6) || \ |
| 65 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | 64 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 |
| (...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1261 [appController showPreferencesWindow:nil page:page profile:profile]; | 1260 [appController showPreferencesWindow:nil page:page profile:profile]; |
| 1262 } | 1261 } |
| 1263 | 1262 |
| 1264 namespace app_controller_mac { | 1263 namespace app_controller_mac { |
| 1265 | 1264 |
| 1266 bool IsOpeningNewWindow() { | 1265 bool IsOpeningNewWindow() { |
| 1267 return g_is_opening_new_window; | 1266 return g_is_opening_new_window; |
| 1268 } | 1267 } |
| 1269 | 1268 |
| 1270 } // namespace app_controller_mac | 1269 } // namespace app_controller_mac |
| OLD | NEW |