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

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

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <cmath> 9 #include <cmath>
10 #include <limits> 10 #include <limits>
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 53 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
54 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h" 54 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
55 #include "chrome/common/chrome_switches.h" 55 #include "chrome/common/chrome_switches.h"
56 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
57 #include "content/public/browser/navigation_controller.h" 57 #include "content/public/browser/navigation_controller.h"
58 #include "content/public/browser/user_metrics.h" 58 #include "content/public/browser/user_metrics.h"
59 #include "content/public/browser/web_contents.h" 59 #include "content/public/browser/web_contents.h"
60 #include "content/public/browser/web_contents_view.h" 60 #include "content/public/browser/web_contents_view.h"
61 #include "grit/generated_resources.h" 61 #include "grit/generated_resources.h"
62 #include "grit/theme_resources.h" 62 #include "grit/theme_resources.h"
63 #include "grit/theme_resources_standard.h"
64 #include "grit/ui_resources.h" 63 #include "grit/ui_resources.h"
65 #include "grit/ui_resources_standard.h"
66 #include "skia/ext/skia_utils_mac.h" 64 #include "skia/ext/skia_utils_mac.h"
67 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" 65 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
68 #include "ui/base/l10n/l10n_util.h" 66 #include "ui/base/l10n/l10n_util.h"
69 #include "ui/base/resource/resource_bundle.h" 67 #include "ui/base/resource/resource_bundle.h"
70 #include "ui/gfx/image/image.h" 68 #include "ui/gfx/image/image.h"
71 #include "ui/gfx/mac/nsimage_cache.h" 69 #include "ui/gfx/mac/nsimage_cache.h"
72 70
73 using content::OpenURLParams; 71 using content::OpenURLParams;
74 using content::Referrer; 72 using content::Referrer;
75 using content::UserMetricsAction; 73 using content::UserMetricsAction;
(...skipping 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after
2123 NSInteger index = [self indexFromModelIndex:modelIndex]; 2121 NSInteger index = [self indexFromModelIndex:modelIndex];
2124 BrowserWindowController* controller = 2122 BrowserWindowController* controller =
2125 (BrowserWindowController*)[[switchView_ window] windowController]; 2123 (BrowserWindowController*)[[switchView_ window] windowController];
2126 DCHECK(index >= 0); 2124 DCHECK(index >= 0);
2127 if (index >= 0) { 2125 if (index >= 0) {
2128 [controller setTab:[self viewAtIndex:index] isDraggable:YES]; 2126 [controller setTab:[self viewAtIndex:index] isDraggable:YES];
2129 } 2127 }
2130 } 2128 }
2131 2129
2132 @end 2130 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698