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: fix mac Created 8 years, 5 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/gtk/location_bar_view_gtk.cc ('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/zoom_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 233 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
244 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;	244 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;

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

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

247 virtual void UpdateTitleBar() OVERRIDE;	247 virtual void UpdateTitleBar() OVERRIDE;

248 virtual void BookmarkBarStateChanged(	248 virtual void BookmarkBarStateChanged(

249 BookmarkBar::AnimateChangeType change_type) OVERRIDE;	249 BookmarkBar::AnimateChangeType change_type) OVERRIDE;

250 virtual void UpdateDevTools() OVERRIDE;	250 virtual void UpdateDevTools() OVERRIDE;

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

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

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

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

255 ZoomController::ZoomIconState zoom_icon_state) OVERRIDE;

256 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;

257 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;

258 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;	255 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

259 virtual gfx::Rect GetBounds() const OVERRIDE;	256 virtual gfx::Rect GetBounds() const OVERRIDE;

260 virtual bool IsMaximized() const OVERRIDE;	257 virtual bool IsMaximized() const OVERRIDE;

261 virtual bool IsMinimized() const OVERRIDE;	258 virtual bool IsMinimized() const OVERRIDE;

262 virtual void Maximize() OVERRIDE;	259 virtual void Maximize() OVERRIDE;

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

264 virtual void Restore() OVERRIDE;	261 virtual void Restore() OVERRIDE;

265 virtual void EnterFullscreen(	262 virtual void EnterFullscreen(

266 const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE;	263 const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE;

267 virtual void ExitFullscreen() OVERRIDE;	264 virtual void ExitFullscreen() OVERRIDE;

(...skipping 444 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
712 gfx::ScopedSysColorChangeListener color_change_listener_;	709 gfx::ScopedSysColorChangeListener color_change_listener_;

713	710

714 #if defined(USE_AURA)	711 #if defined(USE_AURA)

715 scoped_ptr<SearchViewController> search_view_controller_;	712 scoped_ptr<SearchViewController> search_view_controller_;

716 #endif	713 #endif

717	714

718 DISALLOW_COPY_AND_ASSIGN(BrowserView);	715 DISALLOW_COPY_AND_ASSIGN(BrowserView);

719 };	716 };

720	717

721 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_	718 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_

OLD	NEW