chrome/browser/ui/cocoa/tabs/tab_controller.mm - Issue 797393003: MacViews: Rename Cocoa files to avoid conflict with Views.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/media_indicator_button_unittest.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tabs/tab_controller.mm

diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm

index 2a8d3b65b9825050c7535396a5623a851e4eed73..5865a6ec28e8b2d23d0b8d5bde7d8f276b027eb4 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm

@@ -13,7 +13,7 @@

#import "chrome/browser/themes/theme_properties.h"

#import "chrome/browser/themes/theme_service.h"

#import "chrome/browser/ui/cocoa/sprite_view.h"

-#import "chrome/browser/ui/cocoa/tabs/media_indicator_button.h"

+#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"

#import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"

#import "chrome/browser/ui/cocoa/tabs/tab_view.h"

#import "chrome/browser/ui/cocoa/themed_window.h"