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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10736028: Refactor browser window zoom handling and enable zoom icon on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
« chrome/browser/ui/browser_window.h ('K') | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 48 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
49 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; 49 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
50 virtual StatusBubble* GetStatusBubble() OVERRIDE; 50 virtual StatusBubble* GetStatusBubble() OVERRIDE;
51 virtual void UpdateTitleBar() OVERRIDE; 51 virtual void UpdateTitleBar() OVERRIDE;
52 virtual void BookmarkBarStateChanged( 52 virtual void BookmarkBarStateChanged(
53 BookmarkBar::AnimateChangeType change_type) OVERRIDE; 53 BookmarkBar::AnimateChangeType change_type) OVERRIDE;
54 virtual void UpdateDevTools() OVERRIDE; 54 virtual void UpdateDevTools() OVERRIDE;
55 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE; 55 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;
56 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; 56 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
57 virtual void SetStarredState(bool is_starred) OVERRIDE; 57 virtual void SetStarredState(bool is_starred) OVERRIDE;
58 virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE; 58 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;
59 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;
60 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;
61 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 59 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
62 virtual gfx::Rect GetBounds() const OVERRIDE; 60 virtual gfx::Rect GetBounds() const OVERRIDE;
63 virtual bool IsMaximized() const OVERRIDE; 61 virtual bool IsMaximized() const OVERRIDE;
64 virtual bool IsMinimized() const OVERRIDE; 62 virtual bool IsMinimized() const OVERRIDE;
65 virtual void Maximize() OVERRIDE; 63 virtual void Maximize() OVERRIDE;
66 virtual void Minimize() OVERRIDE; 64 virtual void Minimize() OVERRIDE;
67 virtual void Restore() OVERRIDE; 65 virtual void Restore() OVERRIDE;
68 virtual void EnterFullscreen( 66 virtual void EnterFullscreen(
69 const GURL& url, FullscreenExitBubbleType type) OVERRIDE; 67 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;
70 virtual void ExitFullscreen() OVERRIDE; 68 virtual void ExitFullscreen() OVERRIDE;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 PrefChangeRegistrar pref_change_registrar_; 163 PrefChangeRegistrar pref_change_registrar_;
166 Browser* browser_; // weak, owned by controller 164 Browser* browser_; // weak, owned by controller
167 BrowserWindowController* controller_; // weak, owns us 165 BrowserWindowController* controller_; // weak, owns us
168 base::WeakPtrFactory<Browser> confirm_close_factory_; 166 base::WeakPtrFactory<Browser> confirm_close_factory_;
169 scoped_nsobject<NSString> pending_window_title_; 167 scoped_nsobject<NSString> pending_window_title_;
170 ui::WindowShowState initial_show_state_; 168 ui::WindowShowState initial_show_state_;
171 NSInteger attention_request_id_; // identifier from requestUserAttention 169 NSInteger attention_request_id_; // identifier from requestUserAttention
172 }; 170 };
173 171
174 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 172 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW
« chrome/browser/ui/browser_window.h ('K') | « chrome/browser/ui/browser_window.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa.mm » ('j') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698