chrome/browser/ui/panels/panel_browser_window.h - Issue 10831372: Revert 152080 - Refactor browser window zoom handling and enable zoom icon on all platforms.

Side by Side Diff: chrome/browser/ui/panels/panel_browser_window.h

Issue 10831372: Revert 152080 - 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

« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/panels/panel_browser_window.cc » ('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_PANELS_PANEL_BROWSER_WINDOW_H_	5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_WINDOW_H_

6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_WINDOW_H_	6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_WINDOW_H_

7	7

8 #include "chrome/browser/ui/browser_window.h"	8 #include "chrome/browser/ui/browser_window.h"

9 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"	9 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"

10	10

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

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

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 SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;	59 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;

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

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

62 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;	62 virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE;

	63 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;

	64 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;

63 virtual void EnterFullscreen(	65 virtual void EnterFullscreen(

64 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;	66 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;

65 virtual void ExitFullscreen() OVERRIDE;	67 virtual void ExitFullscreen() OVERRIDE;

66 #if defined(OS_WIN)	68 #if defined(OS_WIN)

67 virtual void SetMetroSnapMode(bool enable) OVERRIDE;	69 virtual void SetMetroSnapMode(bool enable) OVERRIDE;

68 virtual bool IsInMetroSnapMode() const OVERRIDE;	70 virtual bool IsInMetroSnapMode() const OVERRIDE;

69 #endif	71 #endif

70 virtual void UpdateFullscreenExitBubbleContent(	72 virtual void UpdateFullscreenExitBubbleContent(

71 const GURL& url,	73 const GURL& url,

72 FullscreenExitBubbleType bubble_type) OVERRIDE;	74 FullscreenExitBubbleType bubble_type) OVERRIDE;

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 Panel* panel_; // Weak pointer. Owns us.	167 Panel* panel_; // Weak pointer. Owns us.

166	168

167 // Platform specifc implementation for panels. It'd be one of	169 // Platform specifc implementation for panels. It'd be one of

168 // PanelBrowserWindowGtk/PanelBrowserView/PanelBrowserWindowCocoa.	170 // PanelBrowserWindowGtk/PanelBrowserView/PanelBrowserWindowCocoa.

169 NativePanel* native_panel_; // Weak, owns us (through ownership of Panel).	171 NativePanel* native_panel_; // Weak, owns us (through ownership of Panel).

170	172

171 DISALLOW_COPY_AND_ASSIGN(PanelBrowserWindow);	173 DISALLOW_COPY_AND_ASSIGN(PanelBrowserWindow);

172 };	174 };

173	175

174 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_WINDOW_H_	176 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_WINDOW_H_

OLD	NEW