chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm - Issue 1162393003: Replace info_bubble::BubbleArrowLocation with views::BubbleBorder::Arrow

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/extensions/extension_popup_controller.mm

Issue 1162393003: Replace info_bubble::BubbleArrowLocation with views::BubbleBorder::Arrow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compile in test Created 5 years, 7 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/extensions/extension_popup_controller.h ('k') | chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

index 0897b25b886446918a3d12dc10df53e09f851b37..dacd8b66cfd3762a05e9ac47591d3ea591711045 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

@@ -48,7 +48,7 @@ CGFloat Clamp(CGFloat value, CGFloat min, CGFloat max) {

// Callers should be using the public static method for initialization.

- (id)initWithParentWindow:(NSWindow*)parentWindow

anchoredAt:(NSPoint)anchoredAt

- arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation

+ arrowLocation:(views::BubbleBorder::Arrow)arrowLocation

devMode:(BOOL)devMode;

// Set the ExtensionViewHost, taking ownership.

@@ -162,7 +162,7 @@ class ExtensionPopupNotificationBridge : public content::NotificationObserver {

- (id)initWithParentWindow:(NSWindow*)parentWindow

anchoredAt:(NSPoint)anchoredAt

- arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation

+ arrowLocation:(views::BubbleBorder::Arrow)arrowLocation

devMode:(BOOL)devMode {

base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]

initWithContentRect:ui::kWindowSizeDeterminedLater

@@ -255,8 +255,7 @@ class ExtensionPopupNotificationBridge : public content::NotificationObserver {

+ (ExtensionPopupController*)host:(scoped_ptr<ExtensionViewHost>)host

inBrowser:(Browser*)browser

anchoredAt:(NSPoint)anchoredAt

- arrowLocation:(info_bubble::BubbleArrowLocation)

- arrowLocation

+ arrowLocation:(views::BubbleBorder::Arrow)arrowLocation

devMode:(BOOL)devMode {

DCHECK([NSThread isMainThread]);

DCHECK(browser);