chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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_folder_hover_state.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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_folder_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h

index 20ea39e82608d0283b56ed14a618e157581cc69e..8d8dea73d0c65e2ab0b89d3a4f40937aa9f49ca4 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h

@@ -4,7 +4,7 @@

#import <Cocoa/Cocoa.h>

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

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

// Hover state machine. Encapsulates the hover state for

@@ -39,7 +39,7 @@

// Like normal menus, hovering over a folder button causes it to

// open. This variable is set when a hover is initiated (but has

// not necessarily fired yet).

- scoped_nsobject<BookmarkButton> hoverButton_;

+ base::scoped_nsobject<BookmarkButton> hoverButton_;

// We model hover state as a state machine with specific allowable

// transitions. |hoverState_| is the state of this machine at any