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

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

Issue 9215002: Fix window zoom in a sane way, remove nasty casts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 8 years, 11 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
OLDNEW
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 #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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 const GURL& url, 120 const GURL& url,
121 FullscreenExitBubbleType bubble_type) OVERRIDE; 121 FullscreenExitBubbleType bubble_type) OVERRIDE;
122 virtual void ExitPresentationMode() OVERRIDE; 122 virtual void ExitPresentationMode() OVERRIDE;
123 virtual bool InPresentationMode() OVERRIDE; 123 virtual bool InPresentationMode() OVERRIDE;
124 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; 124 virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE;
125 virtual void HideInstant() OVERRIDE; 125 virtual void HideInstant() OVERRIDE;
126 virtual gfx::Rect GetInstantBounds() OVERRIDE; 126 virtual gfx::Rect GetInstantBounds() OVERRIDE;
127 virtual WindowOpenDisposition GetDispositionForPopupBounds( 127 virtual WindowOpenDisposition GetDispositionForPopupBounds(
128 const gfx::Rect& bounds) OVERRIDE; 128 const gfx::Rect& bounds) OVERRIDE;
129 virtual FindBar* CreateFindBar() OVERRIDE; 129 virtual FindBar* CreateFindBar() OVERRIDE;
130 virtual void UpdatePreferredSize(content::WebContents* web_contents,
131 const gfx::Size& pref_size) OVERRIDE;
132 virtual void ShowAvatarBubble(content::WebContents* web_contents, 130 virtual void ShowAvatarBubble(content::WebContents* web_contents,
133 const gfx::Rect& rect) OVERRIDE; 131 const gfx::Rect& rect) OVERRIDE;
134 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE; 132 virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
135 133
136 // Overridden from NotificationObserver 134 // Overridden from NotificationObserver
137 virtual void Observe(int type, 135 virtual void Observe(int type,
138 const content::NotificationSource& source, 136 const content::NotificationSource& source,
139 const content::NotificationDetails& details) OVERRIDE; 137 const content::NotificationDetails& details) OVERRIDE;
140 138
141 // Adds the given FindBar cocoa controller to this browser window. 139 // Adds the given FindBar cocoa controller to this browser window.
(...skipping 11 matching lines...) Expand all
153 content::NotificationRegistrar registrar_; 151 content::NotificationRegistrar registrar_;
154 PrefChangeRegistrar pref_change_registrar_; 152 PrefChangeRegistrar pref_change_registrar_;
155 Browser* browser_; // weak, owned by controller 153 Browser* browser_; // weak, owned by controller
156 BrowserWindowController* controller_; // weak, owns us 154 BrowserWindowController* controller_; // weak, owns us
157 base::WeakPtrFactory<Browser> confirm_close_factory_; 155 base::WeakPtrFactory<Browser> confirm_close_factory_;
158 scoped_nsobject<NSString> pending_window_title_; 156 scoped_nsobject<NSString> pending_window_title_;
159 ui::WindowShowState initial_show_state_; 157 ui::WindowShowState initial_show_state_;
160 }; 158 };
161 159
162 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 160 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_view_mac.mm ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698