Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 8695005: Move accelerator related files to ui/base/accelerators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screen_locker.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/mac/foundation_util.h" 10 #include "base/mac/foundation_util.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "chrome/common/url_constants.h" 62 #include "chrome/common/url_constants.h"
63 #include "content/browser/download/download_manager.h" 63 #include "content/browser/download/download_manager.h"
64 #include "content/browser/tab_contents/tab_contents.h" 64 #include "content/browser/tab_contents/tab_contents.h"
65 #include "content/browser/user_metrics.h" 65 #include "content/browser/user_metrics.h"
66 #include "content/public/browser/browser_thread.h" 66 #include "content/public/browser/browser_thread.h"
67 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
68 #include "content/public/browser/notification_types.h" 68 #include "content/public/browser/notification_types.h"
69 #include "grit/chromium_strings.h" 69 #include "grit/chromium_strings.h"
70 #include "grit/generated_resources.h" 70 #include "grit/generated_resources.h"
71 #include "net/base/net_util.h" 71 #include "net/base/net_util.h"
72 #include "ui/base/accelerators/accelerator_cocoa.h"
72 #include "ui/base/l10n/l10n_util.h" 73 #include "ui/base/l10n/l10n_util.h"
73 #include "ui/base/l10n/l10n_util_mac.h" 74 #include "ui/base/l10n/l10n_util_mac.h"
74 #include "ui/base/models/accelerator_cocoa.h"
75 75
76 using content::BrowserThread; 76 using content::BrowserThread;
77 77
78 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help 78 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help
79 // menu. Provide the declaration so it can be called below when building with 79 // menu. Provide the declaration so it can be called below when building with
80 // the 10.5 SDK. 80 // the 10.5 SDK.
81 #if !defined(MAC_OS_X_VERSION_10_6) || \ 81 #if !defined(MAC_OS_X_VERSION_10_6) || \
82 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 82 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
83 @interface NSApplication (SnowLeopardSDKDeclarations) 83 @interface NSApplication (SnowLeopardSDKDeclarations)
84 - (void)setHelpMenu:(NSMenu*)helpMenu; 84 - (void)setHelpMenu:(NSMenu*)helpMenu;
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 1283
1284 } // namespace browser 1284 } // namespace browser
1285 1285
1286 namespace app_controller_mac { 1286 namespace app_controller_mac {
1287 1287
1288 bool IsOpeningNewWindow() { 1288 bool IsOpeningNewWindow() {
1289 return g_is_opening_new_window; 1289 return g_is_opening_new_window;
1290 } 1290 }
1291 1291
1292 } // namespace app_controller_mac 1292 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screen_locker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698