chrome/browser/ui/cocoa/browser_window_cocoa.h - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 years, 4 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

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/memory/scoped_nsobject.h"

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

	10 #include "chrome/browser/api/prefs/pref_change_registrar.h"

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

11 #include "chrome/browser/prefs/pref_change_registrar.h"

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

13 #include "content/public/browser/notification_registrar.h"	13 #include "content/public/browser/notification_registrar.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;

19 @class NSEvent;	19 @class NSEvent;

20 @class NSMenu;	20 @class NSMenu;

21 @class NSWindow;	21 @class NSWindow;

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 PrefChangeRegistrar pref_change_registrar_;	165 PrefChangeRegistrar pref_change_registrar_;

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

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

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

169 scoped_nsobject<NSString> pending_window_title_;	169 scoped_nsobject<NSString> pending_window_title_;

170 ui::WindowShowState initial_show_state_;	170 ui::WindowShowState initial_show_state_;

171 NSInteger attention_request_id_; // identifier from requestUserAttention	171 NSInteger attention_request_id_; // identifier from requestUserAttention

172 };	172 };

173	173

174 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	174 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

OLD	NEW