chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm - Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts.

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/tab_contents/sad_tab_controller_unittest.mm

Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

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

Index: chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

index 0a813a400419f42b9f96485c73b0deb2fbe826a1..b93c19095f34389cdbbf25f322bbe6c8e3cae31f 100644

--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller_unittest.mm

@@ -6,7 +6,7 @@

#include "base/mac/scoped_nsobject.h"

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

#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"

-#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h"

+#import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/testing_profile.h"

#import "ui/base/cocoa/controls/hyperlink_text_view.h"

« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm ('k') | chrome/browser/ui/cocoa/tab_contents/sad_tab_view.h » ('j') | no next file with comments »