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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

7	7

8 #include "base/memory/scoped_nsobject.h"	8 #include "base/mac/scoped_nsobject.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "chrome/browser/bookmarks/bookmark_model.h"	10 #include "chrome/browser/bookmarks/bookmark_model.h"

11 #include "chrome/browser/extensions/extension_keybinding_registry.h"	11 #include "chrome/browser/extensions/extension_keybinding_registry.h"

12 #include "chrome/browser/ui/browser_window.h"	12 #include "chrome/browser/ui/browser_window.h"

13 #include "chrome/browser/ui/search/search_model_observer.h"	13 #include "chrome/browser/ui/search/search_model_observer.h"

14 #include "ui/base/ui_base_types.h"	14 #include "ui/base/ui_base_types.h"

15	15

16 class Browser;	16 class Browser;

17 @class BrowserWindowController;	17 @class BrowserWindowController;

18 @class FindBarCocoaController;	18 @class FindBarCocoaController;

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162	162

163 protected:	163 protected:

164 virtual void DestroyBrowser() OVERRIDE;	164 virtual void DestroyBrowser() OVERRIDE;

165	165

166 private:	166 private:

167 NSWindow* window() const; // Accessor for the (current) \|NSWindow\|.	167 NSWindow* window() const; // Accessor for the (current) \|NSWindow\|.

168	168

169 Browser* browser_; // weak, owned by controller	169 Browser* browser_; // weak, owned by controller

170 BrowserWindowController* controller_; // weak, owns us	170 BrowserWindowController* controller_; // weak, owns us

171 base::WeakPtrFactory<Browser> confirm_close_factory_;	171 base::WeakPtrFactory<Browser> confirm_close_factory_;

172 scoped_nsobject<NSString> pending_window_title_;	172 base::scoped_nsobject<NSString> pending_window_title_;

173 ui::WindowShowState initial_show_state_;	173 ui::WindowShowState initial_show_state_;

174 NSInteger attention_request_id_; // identifier from requestUserAttention	174 NSInteger attention_request_id_; // identifier from requestUserAttention

175 };	175 };

176	176

177 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	177 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

OLD	NEW