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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "content/public/browser/browser_thread.h" 65 #include "content/public/browser/browser_thread.h"
66 #include "content/public/browser/notification_service.h" 66 #include "content/public/browser/notification_service.h"
67 #include "content/public/browser/notification_types.h" 67 #include "content/public/browser/notification_types.h"
68 #include "grit/chromium_strings.h" 68 #include "grit/chromium_strings.h"
69 #include "grit/generated_resources.h" 69 #include "grit/generated_resources.h"
70 #include "net/base/net_util.h" 70 #include "net/base/net_util.h"
71 #include "ui/base/l10n/l10n_util.h" 71 #include "ui/base/l10n/l10n_util.h"
72 #include "ui/base/l10n/l10n_util_mac.h" 72 #include "ui/base/l10n/l10n_util_mac.h"
73 #include "ui/base/models/accelerator_cocoa.h" 73 #include "ui/base/models/accelerator_cocoa.h"
74 74
75 using content::BrowserThread;
76
75 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help 77 // 10.6 adds a public API for the Spotlight-backed search menu item in the Help
76 // menu. Provide the declaration so it can be called below when building with 78 // menu. Provide the declaration so it can be called below when building with
77 // the 10.5 SDK. 79 // the 10.5 SDK.
78 #if !defined(MAC_OS_X_VERSION_10_6) || \ 80 #if !defined(MAC_OS_X_VERSION_10_6) || \
79 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 81 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
80 @interface NSApplication (SnowLeopardSDKDeclarations) 82 @interface NSApplication (SnowLeopardSDKDeclarations)
81 - (void)setHelpMenu:(NSMenu*)helpMenu; 83 - (void)setHelpMenu:(NSMenu*)helpMenu;
82 @end 84 @end
83 #endif 85 #endif
84 86
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 1268
1267 } // namespace browser 1269 } // namespace browser
1268 1270
1269 namespace app_controller_mac { 1271 namespace app_controller_mac {
1270 1272
1271 bool IsOpeningNewWindow() { 1273 bool IsOpeningNewWindow() {
1272 return g_is_opening_new_window; 1274 return g_is_opening_new_window;
1273 } 1275 }
1274 1276
1275 } // namespace app_controller_mac 1277 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « chrome/browser/aeropeek_manager.cc ('k') | chrome/browser/autocomplete/history_contents_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698