chrome/browser/ui/cocoa/toolbar/toolbar_controller.h - Issue 12763002: Move CrTrackingArea from chrome/browser/ui/cocoa 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/toolbar/toolbar_controller.h

Issue 12763002: Move CrTrackingArea from chrome/browser/ui/cocoa to ui/base/cocoa. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: test in namespace Created 7 years, 9 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

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

index 694b9d8a8a8dccb42bdf801427eb0d7081a036a5..6ac5b720e56a926fbc4dfce80f82aee743766aa1 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

@@ -11,9 +11,9 @@

#include "base/memory/scoped_ptr.h"

#include "base/prefs/public/pref_member.h"

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

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

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

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

+#import "ui/base/cocoa/tracking_area.h"

@class AutocompleteTextField;

@class AutocompleteTextFieldEditor;

@@ -85,7 +85,7 @@ class NotificationBridge;

scoped_nsobject<AutocompleteTextField> locationBarRetainer_;

// Tracking area for mouse enter/exit/moved in the toolbar.

- ScopedCrTrackingArea trackingArea_;

+ ui::ScopedCrTrackingArea trackingArea_;

// We retain/release the hover button since interaction with the

// button may make it go away (e.g. delete menu option over a

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/cocoa/tracking_area.h » ('j') | no next file with comments »