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

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

Issue 100139: Fix mac build break. (Closed)
Patch Set: Created 11 years, 7 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
« no previous file with comments | « no previous file | chrome/common/platform_util_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/cocoa/tab_strip_controller.h" 5 #import "chrome/browser/cocoa/tab_strip_controller.h"
6 6
7 #include "base/sys_string_conversions.h" 7 #include "base/sys_string_conversions.h"
8 #include "chrome/app/chrome_dll_resource.h" 8 #include "chrome/app/chrome_dll_resource.h"
9 #include "chrome/browser/browser.h" 9 #include "chrome/browser/browser.h"
10 #include "chrome/browser/profile.h" 10 #include "chrome/browser/profile.h"
11 #import "chrome/browser/cocoa/tab_strip_view.h" 11 #import "chrome/browser/cocoa/tab_strip_view.h"
12 #import "chrome/browser/cocoa/tab_cell.h" 12 #import "chrome/browser/cocoa/tab_cell.h"
13 #import "chrome/browser/cocoa/tab_contents_controller.h" 13 #import "chrome/browser/cocoa/tab_contents_controller.h"
14 #import "chrome/browser/cocoa/tab_controller.h" 14 #import "chrome/browser/cocoa/tab_controller.h"
15 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" 15 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
16 #import "chrome/browser/cocoa/tab_view.h" 16 #import "chrome/browser/cocoa/tab_view.h"
17 #include "chrome/browser/tab_contents/tab_contents.h" 17 #include "chrome/browser/tab_contents/tab_contents.h"
18 #include "chrome/browser/tabs/tab_strip_model.h" 18 #include "chrome/browser/tabs/tab_strip_model.h"
19 #include "chrome/common/l10n_util.h" 19 #include "chrome/common/l10n_util.h"
20 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
21 #include "grit/generated_resources.h"
21 22
22 @implementation TabStripController 23 @implementation TabStripController
23 24
24 - (id)initWithView:(TabStripView*)view 25 - (id)initWithView:(TabStripView*)view
25 switchView:(NSView*)switchView 26 switchView:(NSView*)switchView
26 model:(TabStripModel*)model { 27 model:(TabStripModel*)model {
27 DCHECK(view && switchView && model); 28 DCHECK(view && switchView && model);
28 if ((self = [super init])) { 29 if ((self = [super init])) {
29 tabView_ = view; 30 tabView_ = view;
30 switchView_ = switchView; 31 switchView_ = switchView;
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 selectedIndex = 0; 371 selectedIndex = 0;
371 } 372 }
372 TabContentsController* selectedController = 373 TabContentsController* selectedController =
373 [tabContentsArray_ objectAtIndex:selectedIndex]; 374 [tabContentsArray_ objectAtIndex:selectedIndex];
374 if (!selectedController) 375 if (!selectedController)
375 return NSZeroRect; 376 return NSZeroRect;
376 return [selectedController growBoxRect]; 377 return [selectedController growBoxRect];
377 } 378 }
378 379
379 @end 380 @end
OLDNEW
« no previous file with comments | « no previous file | chrome/common/platform_util_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698