chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

index 65a43530b79e80e5fd5aa43ba80edc14db189947..821cdee528a4f578fe626bc44cda8972572fd55a 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

@@ -18,7 +18,7 @@

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"

-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"

+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"

#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"