chrome/browser/ui/cocoa/browser_window_cocoa.h - Issue 12803011: Add BaseWindow::GetContentBounds() and use in WindowController::CreateWindowValue()

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

Issue 12803011: Add BaseWindow::GetContentBounds() and use in WindowController::CreateWindowValue() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix osx build Created 7 years, 9 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/base_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

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/bookmarks/bookmark_model.h"	10 #include "chrome/browser/bookmarks/bookmark_model.h"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 virtual StatusBubble* GetStatusBubble() OVERRIDE;	54 virtual StatusBubble* GetStatusBubble() OVERRIDE;

55 virtual void UpdateTitleBar() OVERRIDE;	55 virtual void UpdateTitleBar() OVERRIDE;

56 virtual void BookmarkBarStateChanged(	56 virtual void BookmarkBarStateChanged(

57 BookmarkBar::AnimateChangeType change_type) OVERRIDE;	57 BookmarkBar::AnimateChangeType change_type) OVERRIDE;

58 virtual void UpdateDevTools() OVERRIDE;	58 virtual void UpdateDevTools() OVERRIDE;

59 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;	59 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;

60 virtual void SetStarredState(bool is_starred) OVERRIDE;	60 virtual void SetStarredState(bool is_starred) OVERRIDE;

61 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;	61 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;

62 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;	62 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

63 virtual gfx::Rect GetBounds() const OVERRIDE;	63 virtual gfx::Rect GetBounds() const OVERRIDE;

	64 virtual gfx::Rect GetContentBounds() const OVERRIDE;

64 virtual bool IsMaximized() const OVERRIDE;	65 virtual bool IsMaximized() const OVERRIDE;

65 virtual bool IsMinimized() const OVERRIDE;	66 virtual bool IsMinimized() const OVERRIDE;

66 virtual void Maximize() OVERRIDE;	67 virtual void Maximize() OVERRIDE;

67 virtual void Minimize() OVERRIDE;	68 virtual void Minimize() OVERRIDE;

68 virtual void Restore() OVERRIDE;	69 virtual void Restore() OVERRIDE;

69 virtual void EnterFullscreen(	70 virtual void EnterFullscreen(

70 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;	71 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;

71 virtual void ExitFullscreen() OVERRIDE;	72 virtual void ExitFullscreen() OVERRIDE;

72 virtual void UpdateFullscreenExitBubbleContent(	73 virtual void UpdateFullscreenExitBubbleContent(

73 const GURL& url,	74 const GURL& url,

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165	166

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

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

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

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

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

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

172 };	173 };

173	174

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

OLD	NEW