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

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

Issue 8110003: Show avatar menu from NTP4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac build 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_window.h ('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"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 virtual void OpenTabpose(); 107 virtual void OpenTabpose();
108 virtual void SetPresentationMode(bool presentation_mode); 108 virtual void SetPresentationMode(bool presentation_mode);
109 virtual bool InPresentationMode(); 109 virtual bool InPresentationMode();
110 virtual void PrepareForInstant(); 110 virtual void PrepareForInstant();
111 virtual void ShowInstant(TabContentsWrapper* preview); 111 virtual void ShowInstant(TabContentsWrapper* preview);
112 virtual void HideInstant(bool instant_is_active); 112 virtual void HideInstant(bool instant_is_active);
113 virtual gfx::Rect GetInstantBounds(); 113 virtual gfx::Rect GetInstantBounds();
114 virtual WindowOpenDisposition GetDispositionForPopupBounds( 114 virtual WindowOpenDisposition GetDispositionForPopupBounds(
115 const gfx::Rect& bounds); 115 const gfx::Rect& bounds);
116 virtual FindBar* CreateFindBar() OVERRIDE; 116 virtual FindBar* CreateFindBar() OVERRIDE;
117 virtual void ShowAvatarBubble(TabContents* tab_contents,
118 const gfx::Rect& rect) OVERRIDE;
117 119
118 // Overridden from NotificationObserver 120 // Overridden from NotificationObserver
119 virtual void Observe(int type, 121 virtual void Observe(int type,
120 const NotificationSource& source, 122 const NotificationSource& source,
121 const NotificationDetails& details); 123 const NotificationDetails& details);
122 124
123 // Adds the given FindBar cocoa controller to this browser window. 125 // Adds the given FindBar cocoa controller to this browser window.
124 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 126 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
125 127
126 // Returns the cocoa-world BrowserWindowController 128 // Returns the cocoa-world BrowserWindowController
127 BrowserWindowController* cocoa_controller() { return controller_; } 129 BrowserWindowController* cocoa_controller() { return controller_; }
128 130
129 protected: 131 protected:
130 virtual void DestroyBrowser(); 132 virtual void DestroyBrowser();
131 133
132 private: 134 private:
133 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 135 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
134 void UpdateSidebarForContents(TabContents* tab_contents); 136 void UpdateSidebarForContents(TabContents* tab_contents);
135 137
136 NotificationRegistrar registrar_; 138 NotificationRegistrar registrar_;
137 Browser* browser_; // weak, owned by controller 139 Browser* browser_; // weak, owned by controller
138 BrowserWindowController* controller_; // weak, owns us 140 BrowserWindowController* controller_; // weak, owns us
139 base::WeakPtrFactory<Browser> confirm_close_factory_; 141 base::WeakPtrFactory<Browser> confirm_close_factory_;
140 scoped_nsobject<NSString> pending_window_title_; 142 scoped_nsobject<NSString> pending_window_title_;
141 ui::WindowShowState initial_show_state_; 143 ui::WindowShowState initial_show_state_;
142 }; 144 };
143 145
144 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 146 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698