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

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

Issue 797393003: MacViews: Rename Cocoa files to avoid conflict with Views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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_controller.h" 5 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/mac/bundle_locations.h" 11 #include "base/mac/bundle_locations.h"
12 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
13 #import "chrome/browser/themes/theme_properties.h" 13 #import "chrome/browser/themes/theme_properties.h"
14 #import "chrome/browser/themes/theme_service.h" 14 #import "chrome/browser/themes/theme_service.h"
15 #import "chrome/browser/ui/cocoa/sprite_view.h" 15 #import "chrome/browser/ui/cocoa/sprite_view.h"
16 #import "chrome/browser/ui/cocoa/tabs/media_indicator_button.h" 16 #import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
17 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" 17 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
18 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" 18 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
19 #import "chrome/browser/ui/cocoa/themed_window.h" 19 #import "chrome/browser/ui/cocoa/themed_window.h"
20 #include "content/public/browser/user_metrics.h" 20 #include "content/public/browser/user_metrics.h"
21 #import "extensions/common/extension.h" 21 #import "extensions/common/extension.h"
22 #import "ui/base/cocoa/menu_controller.h" 22 #import "ui/base/cocoa/menu_controller.h"
23 23
24 @implementation TabController 24 @implementation TabController
25 25
26 @synthesize action = action_; 26 @synthesize action = action_;
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 // TabStripDragController. 449 // TabStripDragController.
450 - (BOOL)tabCanBeDragged:(TabController*)controller { 450 - (BOOL)tabCanBeDragged:(TabController*)controller {
451 return [[target_ dragController] tabCanBeDragged:controller]; 451 return [[target_ dragController] tabCanBeDragged:controller];
452 } 452 }
453 453
454 - (void)maybeStartDrag:(NSEvent*)event forTab:(TabController*)tab { 454 - (void)maybeStartDrag:(NSEvent*)event forTab:(TabController*)tab {
455 [[target_ dragController] maybeStartDrag:event forTab:tab]; 455 [[target_ dragController] maybeStartDrag:event forTab:tab];
456 } 456 }
457 457
458 @end 458 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698