Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 8135001: Fixed behavior of the bookmark bar visibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DCHECK_EQ instead of DCHECK Created 9 years, 2 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
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_nsobject.h" 9 #include "base/memory/scoped_nsobject.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/prefs/pref_change_registrar.h"
12 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
13 #include "content/common/notification_registrar.h" 14 #include "content/common/notification_registrar.h"
14 #include "ui/base/ui_base_types.h" 15 #include "ui/base/ui_base_types.h"
15 16
16 class Browser; 17 class Browser;
17 @class BrowserWindowController; 18 @class BrowserWindowController;
18 @class FindBarCocoaController; 19 @class FindBarCocoaController;
19 @class NSEvent; 20 @class NSEvent;
20 @class NSMenu; 21 @class NSMenu;
21 @class NSWindow; 22 @class NSWindow;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 BrowserWindowController* cocoa_controller() { return controller_; } 129 BrowserWindowController* cocoa_controller() { return controller_; }
129 130
130 protected: 131 protected:
131 virtual void DestroyBrowser(); 132 virtual void DestroyBrowser();
132 133
133 private: 134 private:
134 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 135 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
135 void UpdateSidebarForContents(TabContents* tab_contents); 136 void UpdateSidebarForContents(TabContents* tab_contents);
136 137
137 NotificationRegistrar registrar_; 138 NotificationRegistrar registrar_;
139 PrefChangeRegistrar pref_change_registrar_;
138 Browser* browser_; // weak, owned by controller 140 Browser* browser_; // weak, owned by controller
139 BrowserWindowController* controller_; // weak, owns us 141 BrowserWindowController* controller_; // weak, owns us
140 base::WeakPtrFactory<Browser> confirm_close_factory_; 142 base::WeakPtrFactory<Browser> confirm_close_factory_;
141 scoped_nsobject<NSString> pending_window_title_; 143 scoped_nsobject<NSString> pending_window_title_;
142 ui::WindowShowState initial_show_state_; 144 ui::WindowShowState initial_show_state_;
143 }; 145 };
144 146
145 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 147 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698