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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

Issue 7200045: Move app/mac/ files to ui/gfx/mac/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 months 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/ui/cocoa/tabs/tab_strip_controller.h" 5 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
6 6
7 #import <QuartzCore/QuartzCore.h> 7 #import <QuartzCore/QuartzCore.h>
8 8
9 #include <limits> 9 #include <limits>
10 #include <string> 10 #include <string>
11 11
12 #include "app/mac/nsimage_cache.h"
13 #include "base/command_line.h" 12 #include "base/command_line.h"
14 #include "base/mac/mac_util.h" 13 #include "base/mac/mac_util.h"
15 #include "base/sys_string_conversions.h" 14 #include "base/sys_string_conversions.h"
16 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
17 #include "chrome/browser/autocomplete/autocomplete.h" 16 #include "chrome/browser/autocomplete/autocomplete.h"
18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
19 #include "chrome/browser/autocomplete/autocomplete_match.h" 18 #include "chrome/browser/autocomplete/autocomplete_match.h"
20 #include "chrome/browser/debugger/devtools_window.h" 19 #include "chrome/browser/debugger/devtools_window.h"
21 #include "chrome/browser/extensions/extension_tab_helper.h" 20 #include "chrome/browser/extensions/extension_tab_helper.h"
22 #include "chrome/browser/favicon/favicon_tab_helper.h" 21 #include "chrome/browser/favicon/favicon_tab_helper.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "content/common/notification_service.h" 57 #include "content/common/notification_service.h"
59 #include "grit/app_resources.h" 58 #include "grit/app_resources.h"
60 #include "grit/generated_resources.h" 59 #include "grit/generated_resources.h"
61 #include "grit/theme_resources.h" 60 #include "grit/theme_resources.h"
62 #include "grit/theme_resources_standard.h" 61 #include "grit/theme_resources_standard.h"
63 #include "skia/ext/skia_utils_mac.h" 62 #include "skia/ext/skia_utils_mac.h"
64 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 63 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
65 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
66 #include "ui/base/resource/resource_bundle.h" 65 #include "ui/base/resource/resource_bundle.h"
67 #include "ui/gfx/image/image.h" 66 #include "ui/gfx/image/image.h"
67 #include "ui/gfx/mac/nsimage_cache.h"
68 68
69 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; 69 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
70 70
71 // 10.7 adds public APIs for full-screen support. Provide the declaration so it 71 // 10.7 adds public APIs for full-screen support. Provide the declaration so it
72 // can be called below when building with the 10.5 SDK. 72 // can be called below when building with the 10.5 SDK.
73 #if !defined(MAC_OS_X_VERSION_10_7) || \ 73 #if !defined(MAC_OS_X_VERSION_10_7) || \
74 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 74 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
75 75
76 @interface NSWindow (LionSDKDeclarations) 76 @interface NSWindow (LionSDKDeclarations)
77 - (void)toggleFullScreen:(id)sender; 77 - (void)toggleFullScreen:(id)sender;
(...skipping 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after
2136 } 2136 }
2137 2137
2138 std::string profileName = browser_->profile()->GetPrefs()->GetString( 2138 std::string profileName = browser_->profile()->GetPrefs()->GetString(
2139 prefs::kGoogleServicesUsername); 2139 prefs::kGoogleServicesUsername);
2140 [profileMenuButton_ setProfileDisplayName: 2140 [profileMenuButton_ setProfileDisplayName:
2141 [NSString stringWithUTF8String:profileName.c_str()]]; 2141 [NSString stringWithUTF8String:profileName.c_str()]];
2142 [profileMenuButton_ setHidden:NO]; 2142 [profileMenuButton_ setHidden:NO];
2143 } 2143 }
2144 2144
2145 @end 2145 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698