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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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>
11 11
12 #include "app/l10n_util.h" 12 #include "app/l10n_util.h"
13 #include "app/mac/nsimage_cache.h" 13 #include "app/mac/nsimage_cache.h"
14 #include "app/resource_bundle.h"
15 #include "base/mac/mac_util.h" 14 #include "base/mac/mac_util.h"
16 #include "base/sys_string_conversions.h" 15 #include "base/sys_string_conversions.h"
17 #include "chrome/app/chrome_command_ids.h" 16 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/autocomplete/autocomplete.h" 17 #include "chrome/browser/autocomplete/autocomplete.h"
19 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 18 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
20 #include "chrome/browser/autocomplete/autocomplete_match.h" 19 #include "chrome/browser/autocomplete/autocomplete_match.h"
21 #include "chrome/browser/metrics/user_metrics.h" 20 #include "chrome/browser/metrics/user_metrics.h"
22 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/debugger/devtools_window.h" 22 #include "chrome/browser/debugger/devtools_window.h"
24 #include "chrome/browser/net/url_fixer_upper.h" 23 #include "chrome/browser/net/url_fixer_upper.h"
(...skipping 16 matching lines...) Expand all
41 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 40 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
42 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" 41 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
43 #include "chrome/browser/ui/find_bar/find_bar.h" 42 #include "chrome/browser/ui/find_bar/find_bar.h"
44 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 43 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
45 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 44 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
46 #include "grit/app_resources.h" 45 #include "grit/app_resources.h"
47 #include "grit/generated_resources.h" 46 #include "grit/generated_resources.h"
48 #include "grit/theme_resources.h" 47 #include "grit/theme_resources.h"
49 #include "skia/ext/skia_utils_mac.h" 48 #include "skia/ext/skia_utils_mac.h"
50 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 49 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
50 #include "ui/base/resource/resource_bundle.h"
51 51
52 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; 52 NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
53 53
54 namespace { 54 namespace {
55 55
56 // The images names used for different states of the new tab button. 56 // The images names used for different states of the new tab button.
57 NSString* const kNewTabHoverImage = @"newtab_h.pdf"; 57 NSString* const kNewTabHoverImage = @"newtab_h.pdf";
58 NSString* const kNewTabImage = @"newtab.pdf"; 58 NSString* const kNewTabImage = @"newtab.pdf";
59 NSString* const kNewTabPressedImage = @"newtab_p.pdf"; 59 NSString* const kNewTabPressedImage = @"newtab_p.pdf";
60 60
(...skipping 1834 matching lines...) Expand 10 before | Expand all | Expand 10 after
1895 NSInteger index = [self indexFromModelIndex:modelIndex]; 1895 NSInteger index = [self indexFromModelIndex:modelIndex];
1896 BrowserWindowController* controller = 1896 BrowserWindowController* controller =
1897 (BrowserWindowController*)[[switchView_ window] windowController]; 1897 (BrowserWindowController*)[[switchView_ window] windowController];
1898 DCHECK(index >= 0); 1898 DCHECK(index >= 0);
1899 if (index >= 0) { 1899 if (index >= 0) {
1900 [controller setTab:[self viewAtIndex:index] isDraggable:YES]; 1900 [controller setTab:[self viewAtIndex:index] isDraggable:YES];
1901 } 1901 }
1902 } 1902 }
1903 1903
1904 @end 1904 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabpose_window.mm ('k') | chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698