| 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 "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 #include "net/base/net_util.h" | 75 #include "net/base/net_util.h" |
| 76 #include "ui/base/accelerators/accelerator_cocoa.h" | 76 #include "ui/base/accelerators/accelerator_cocoa.h" |
| 77 #include "ui/base/l10n/l10n_util.h" | 77 #include "ui/base/l10n/l10n_util.h" |
| 78 #include "ui/base/l10n/l10n_util_mac.h" | 78 #include "ui/base/l10n/l10n_util_mac.h" |
| 79 | 79 |
| 80 using content::BrowserContext; | 80 using content::BrowserContext; |
| 81 using content::BrowserThread; | 81 using content::BrowserThread; |
| 82 using content::DownloadManager; | 82 using content::DownloadManager; |
| 83 using content::UserMetricsAction; | 83 using content::UserMetricsAction; |
| 84 | 84 |
| 85 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help | |
| 86 // menu. Provide the declaration so it can be called below when building with | |
| 87 // the 10.5 SDK. | |
| 88 #if !defined(MAC_OS_X_VERSION_10_6) || \ | |
| 89 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | |
| 90 @interface NSApplication (SnowLeopardSDKDeclarations) | |
| 91 - (void)setHelpMenu:(NSMenu*)helpMenu; | |
| 92 @end | |
| 93 #endif | |
| 94 | |
| 95 namespace { | 85 namespace { |
| 96 | 86 |
| 97 // Declare notification names from the 10.7 SDK. | 87 // Declare notification names from the 10.7 SDK. |
| 98 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 88 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
| 99 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 | 89 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 |
| 100 NSString* NSPopoverDidShowNotification = @"NSPopoverDidShowNotification"; | 90 NSString* NSPopoverDidShowNotification = @"NSPopoverDidShowNotification"; |
| 101 NSString* NSPopoverDidCloseNotification = @"NSPopoverDidCloseNotification"; | 91 NSString* NSPopoverDidCloseNotification = @"NSPopoverDidCloseNotification"; |
| 102 #endif | 92 #endif |
| 103 | 93 |
| 104 // True while AppController is calling chrome::NewEmptyWindow(). We need a | 94 // True while AppController is calling chrome::NewEmptyWindow(). We need a |
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1318 | 1308 |
| 1319 } // namespace browser | 1309 } // namespace browser |
| 1320 | 1310 |
| 1321 namespace app_controller_mac { | 1311 namespace app_controller_mac { |
| 1322 | 1312 |
| 1323 bool IsOpeningNewWindow() { | 1313 bool IsOpeningNewWindow() { |
| 1324 return g_is_opening_new_window; | 1314 return g_is_opening_new_window; |
| 1325 } | 1315 } |
| 1326 | 1316 |
| 1327 } // namespace app_controller_mac | 1317 } // namespace app_controller_mac |
| OLD | NEW |