chrome/browser/ui/views/frame/browser_view.h - Issue 10736028: Refactor browser window zoom handling and enable zoom icon on all platforms.

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.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/panels/panel_browser_window.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_VIEWS_FRAME_BROWSER_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

7	7

8 #include <map>	8 #include <map>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

(...skipping 229 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
240 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;	240 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;

241 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;	241 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;

242 virtual StatusBubble* GetStatusBubble() OVERRIDE;	242 virtual StatusBubble* GetStatusBubble() OVERRIDE;

243 virtual void UpdateTitleBar() OVERRIDE;	243 virtual void UpdateTitleBar() OVERRIDE;

244 virtual void BookmarkBarStateChanged(	244 virtual void BookmarkBarStateChanged(

245 BookmarkBar::AnimateChangeType change_type) OVERRIDE;	245 BookmarkBar::AnimateChangeType change_type) OVERRIDE;

246 virtual void UpdateDevTools() OVERRIDE;	246 virtual void UpdateDevTools() OVERRIDE;

247 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;	247 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;

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

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

250 virtual void SetZoomIconState(	250 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;

251 ZoomController::ZoomIconState zoom_icon_state) OVERRIDE;

252 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;

253 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;

254 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;	251 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

255 virtual gfx::Rect GetBounds() const OVERRIDE;	252 virtual gfx::Rect GetBounds() const OVERRIDE;

256 virtual bool IsMaximized() const OVERRIDE;	253 virtual bool IsMaximized() const OVERRIDE;

257 virtual bool IsMinimized() const OVERRIDE;	254 virtual bool IsMinimized() const OVERRIDE;

258 virtual void Maximize() OVERRIDE;	255 virtual void Maximize() OVERRIDE;

259 virtual void Minimize() OVERRIDE;	256 virtual void Minimize() OVERRIDE;

260 virtual void Restore() OVERRIDE;	257 virtual void Restore() OVERRIDE;

261 virtual void EnterFullscreen(	258 virtual void EnterFullscreen(

262 const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE;	259 const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE;

263 virtual void ExitFullscreen() OVERRIDE;	260 virtual void ExitFullscreen() OVERRIDE;

(...skipping 449 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
713 #if defined(USE_AURA)	710 #if defined(USE_AURA)

714 scoped_ptr<SearchViewController> search_view_controller_;	711 scoped_ptr<SearchViewController> search_view_controller_;

715 #endif	712 #endif

716	713

717 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;	714 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;

718	715

719 DISALLOW_COPY_AND_ASSIGN(BrowserView);	716 DISALLOW_COPY_AND_ASSIGN(BrowserView);

720 };	717 };

721	718

722 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	719 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

OLD	NEW