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

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

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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) 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/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>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/ui/find_bar/find_bar.h" 42 #include "chrome/browser/ui/find_bar/find_bar.h"
43 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 43 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
44 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 44 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
45 #include "grit/app_resources.h" 45 #include "grit/app_resources.h"
46 #include "grit/generated_resources.h" 46 #include "grit/generated_resources.h"
47 #include "grit/theme_resources.h" 47 #include "grit/theme_resources.h"
48 #include "skia/ext/skia_utils_mac.h" 48 #include "skia/ext/skia_utils_mac.h"
49 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 49 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
50 #include "ui/base/l10n/l10n_util.h" 50 #include "ui/base/l10n/l10n_util.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/gfx/image.h"
52 53
53 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; 54 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
54 55
55 namespace { 56 namespace {
56 57
57 // The images names used for different states of the new tab button. 58 // The images names used for different states of the new tab button.
58 NSString* const kNewTabHoverImage = @"newtab_h.pdf"; 59 NSString* const kNewTabHoverImage = @"newtab_h.pdf";
59 NSString* const kNewTabImage = @"newtab.pdf"; 60 NSString* const kNewTabImage = @"newtab.pdf";
60 NSString* const kNewTabPressedImage = @"newtab_p.pdf"; 61 NSString* const kNewTabPressedImage = @"newtab_p.pdf";
61 62
(...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after
1899 NSInteger index = [self indexFromModelIndex:modelIndex]; 1900 NSInteger index = [self indexFromModelIndex:modelIndex];
1900 BrowserWindowController* controller = 1901 BrowserWindowController* controller =
1901 (BrowserWindowController*)[[switchView_ window] windowController]; 1902 (BrowserWindowController*)[[switchView_ window] windowController];
1902 DCHECK(index >= 0); 1903 DCHECK(index >= 0);
1903 if (index >= 0) { 1904 if (index >= 0) {
1904 [controller setTab:[self viewAtIndex:index] isDraggable:YES]; 1905 [controller setTab:[self viewAtIndex:index] isDraggable:YES];
1905 } 1906 }
1906 } 1907 }
1907 1908
1908 @end 1909 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698