| OLD | NEW |
| 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 #include "app/l10n_util_mac.h" | 5 #include "app/l10n_util_mac.h" |
| 6 #include "base/mac_util.h" | 6 #include "base/mac/mac_util.h" |
| 7 #import "chrome/browser/themes/browser_theme_provider.h" | 7 #import "chrome/browser/themes/browser_theme_provider.h" |
| 8 #import "chrome/browser/ui/cocoa/menu_controller.h" | 8 #import "chrome/browser/ui/cocoa/menu_controller.h" |
| 9 #import "chrome/browser/ui/cocoa/tab_controller.h" | 9 #import "chrome/browser/ui/cocoa/tab_controller.h" |
| 10 #import "chrome/browser/ui/cocoa/tab_controller_target.h" | 10 #import "chrome/browser/ui/cocoa/tab_controller_target.h" |
| 11 #import "chrome/browser/ui/cocoa/tab_view.h" | 11 #import "chrome/browser/ui/cocoa/tab_view.h" |
| 12 #import "chrome/browser/ui/cocoa/themed_window.h" | 12 #import "chrome/browser/ui/cocoa/themed_window.h" |
| 13 #import "chrome/common/extensions/extension.h" | 13 #import "chrome/common/extensions/extension.h" |
| 14 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" |
| 15 | 15 |
| 16 @implementation TabController | 16 @implementation TabController |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 + (CGFloat)minSelectedTabWidth { return 46; } | 66 + (CGFloat)minSelectedTabWidth { return 46; } |
| 67 + (CGFloat)maxTabWidth { return 220; } | 67 + (CGFloat)maxTabWidth { return 220; } |
| 68 + (CGFloat)miniTabWidth { return 53; } | 68 + (CGFloat)miniTabWidth { return 53; } |
| 69 + (CGFloat)appTabWidth { return 66; } | 69 + (CGFloat)appTabWidth { return 66; } |
| 70 | 70 |
| 71 - (TabView*)tabView { | 71 - (TabView*)tabView { |
| 72 return static_cast<TabView*>([self view]); | 72 return static_cast<TabView*>([self view]); |
| 73 } | 73 } |
| 74 | 74 |
| 75 - (id)init { | 75 - (id)init { |
| 76 self = [super initWithNibName:@"TabView" bundle:mac_util::MainAppBundle()]; | 76 self = [super initWithNibName:@"TabView" bundle:base::mac::MainAppBundle()]; |
| 77 if (self != nil) { | 77 if (self != nil) { |
| 78 isIconShowing_ = YES; | 78 isIconShowing_ = YES; |
| 79 NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter]; | 79 NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter]; |
| 80 [defaultCenter addObserver:self | 80 [defaultCenter addObserver:self |
| 81 selector:@selector(viewResized:) | 81 selector:@selector(viewResized:) |
| 82 name:NSViewFrameDidChangeNotification | 82 name:NSViewFrameDidChangeNotification |
| 83 object:[self view]]; | 83 object:[self view]]; |
| 84 [defaultCenter addObserver:self | 84 [defaultCenter addObserver:self |
| 85 selector:@selector(themeChangedNotification:) | 85 selector:@selector(themeChangedNotification:) |
| 86 name:kBrowserThemeDidChangeNotification | 86 name:kBrowserThemeDidChangeNotification |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 // Called by the tabs to determine whether we are in rapid (tab) closure mode. | 297 // Called by the tabs to determine whether we are in rapid (tab) closure mode. |
| 298 - (BOOL)inRapidClosureMode { | 298 - (BOOL)inRapidClosureMode { |
| 299 if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) { | 299 if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) { |
| 300 return [[self target] performSelector:@selector(inRapidClosureMode)] ? | 300 return [[self target] performSelector:@selector(inRapidClosureMode)] ? |
| 301 YES : NO; | 301 YES : NO; |
| 302 } | 302 } |
| 303 return NO; | 303 return NO; |
| 304 } | 304 } |
| 305 | 305 |
| 306 @end | 306 @end |
| OLD | NEW |