chrome/browser/ui/cocoa/infobars/infobar_controller.mm - Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa

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/infobars/infobar_controller.mm

Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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

« chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm ('K') | « chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm ('k') | chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/infobars/infobar_controller.mm

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

index 9dc93ff051f31a865c15949444e6581a9ef0594c..51371782207009b8466cdece45ba12bb34da3b61 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

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

#include "chrome/browser/infobars/infobar_service.h"

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

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

-#import "chrome/browser/ui/cocoa/hyperlink_text_view.h"

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

#include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"

#import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"

@@ -18,6 +17,7 @@

#import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

#include "grit/theme_resources.h"

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

#include "ui/gfx/image/image.h"

#include "ui/resources/grit/ui_resources.h"