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

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.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/cocoa/toolbar/toolbar_controller.mm ('k') | chrome/browser/ui/gtk/browser_window_gtk.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_GTK_BROWSER_WINDOW_GTK_H_	5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_

6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_	6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_

7	7

8 #include <gtk/gtk.h>	8 #include <gtk/gtk.h>

9	9

10 #include <string>	10 #include <string>

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

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

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

80 virtual void UpdateTitleBar() OVERRIDE;	80 virtual void UpdateTitleBar() OVERRIDE;

81 virtual void BookmarkBarStateChanged(	81 virtual void BookmarkBarStateChanged(

82 BookmarkBar::AnimateChangeType change_type) OVERRIDE;	82 BookmarkBar::AnimateChangeType change_type) OVERRIDE;

83 virtual void UpdateDevTools() OVERRIDE;	83 virtual void UpdateDevTools() OVERRIDE;

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

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

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

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

	88 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;

	89 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;

88 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;	90 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

89 virtual gfx::Rect GetBounds() const OVERRIDE;	91 virtual gfx::Rect GetBounds() const OVERRIDE;

90 virtual bool IsMaximized() const OVERRIDE;	92 virtual bool IsMaximized() const OVERRIDE;

91 virtual bool IsMinimized() const OVERRIDE;	93 virtual bool IsMinimized() const OVERRIDE;

92 virtual void Maximize() OVERRIDE;	94 virtual void Maximize() OVERRIDE;

93 virtual void Minimize() OVERRIDE;	95 virtual void Minimize() OVERRIDE;

94 virtual void Restore() OVERRIDE;	96 virtual void Restore() OVERRIDE;

95 virtual void EnterFullscreen(	97 virtual void EnterFullscreen(

96 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;	98 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;

97 virtual void ExitFullscreen() OVERRIDE;	99 virtual void ExitFullscreen() OVERRIDE;

(...skipping 472 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
570 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;	572 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;

571	573

572 FullscreenExitBubbleType fullscreen_exit_bubble_type_;	574 FullscreenExitBubbleType fullscreen_exit_bubble_type_;

573	575

574 content::NotificationRegistrar registrar_;	576 content::NotificationRegistrar registrar_;

575	577

576 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);	578 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);

577 };	579 };

578	580

579 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_	581 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_

OLD	NEW