chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.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/constrained_window/constrained_window_mac.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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window_unittest.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h

index 37075399f4ab0001436b46be653b11401db88578..73202e80aada2ae0b0aa325f5f0b39acb0de642d 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h

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

#import <Cocoa/Cocoa.h>

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

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

#include "components/web_modal/native_web_contents_modal_dialog.h"

namespace content {

@@ -50,7 +50,7 @@ class ConstrainedWindowMac {

// The WebContents that owns and constrains this ConstrainedWindowMac. Weak.

content::WebContents* web_contents_;

- scoped_nsprotocol<id<ConstrainedWindowSheet>> sheet_;

+ base::scoped_nsprotocol<id<ConstrainedWindowSheet>> sheet_;

// This is true if the constrained window has been shown.

bool shown_;