chrome/browser/ui/cocoa/browser_window_cocoa.h - Issue 10444040: Tracks changes to zoom icon and zoom percentage. Notifies browser window if the icon should be chan…

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

Issue 10444040: Tracks changes to zoom icon and zoom percentage. Notifies browser window if the icon should be chan… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Changed delegate to observer Created 8 years, 6 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

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_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 #pragma once	7 #pragma once

8	8

9 #include "base/memory/scoped_nsobject.h"	9 #include "base/memory/scoped_nsobject.h"

10 #include "base/memory/weak_ptr.h"	10 #include "base/memory/weak_ptr.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;	50 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;

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

52 virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE;	52 virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE;

53 virtual void UpdateTitleBar() OVERRIDE;	53 virtual void UpdateTitleBar() OVERRIDE;

54 virtual void BookmarkBarStateChanged(	54 virtual void BookmarkBarStateChanged(

55 BookmarkBar::AnimateChangeType change_type) OVERRIDE;	55 BookmarkBar::AnimateChangeType change_type) OVERRIDE;

56 virtual void UpdateDevTools() OVERRIDE;	56 virtual void UpdateDevTools() OVERRIDE;

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

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

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

	60 virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE;

	61 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;

	62 virtual void ShowZoomBubble(int zoomPercent) OVERRIDE;
	tfarina 2012/06/01 00:47:53 nit: zoom_percent nit: zoom_percent Kyle Horimoto 2012/06/01 18:04:50 Done. Show quoted text On 2012/06/01 00:47:53, tfarina wrote: > nit: zoom_percent Done.
60 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;	63 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

61 virtual gfx::Rect GetBounds() const OVERRIDE;	64 virtual gfx::Rect GetBounds() const OVERRIDE;

62 virtual bool IsMaximized() const OVERRIDE;	65 virtual bool IsMaximized() const OVERRIDE;

63 virtual bool IsMinimized() const OVERRIDE;	66 virtual bool IsMinimized() const OVERRIDE;

64 virtual void Maximize() OVERRIDE;	67 virtual void Maximize() OVERRIDE;

65 virtual void Minimize() OVERRIDE;	68 virtual void Minimize() OVERRIDE;

66 virtual void Restore() OVERRIDE;	69 virtual void Restore() OVERRIDE;

67 virtual void EnterFullscreen(	70 virtual void EnterFullscreen(

68 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;	71 const GURL& url, FullscreenExitBubbleType type) OVERRIDE;

69 virtual void ExitFullscreen() OVERRIDE;	72 virtual void ExitFullscreen() OVERRIDE;

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167 PrefChangeRegistrar pref_change_registrar_;	170 PrefChangeRegistrar pref_change_registrar_;

168 Browser* browser_; // weak, owned by controller	171 Browser* browser_; // weak, owned by controller

169 BrowserWindowController* controller_; // weak, owns us	172 BrowserWindowController* controller_; // weak, owns us

170 base::WeakPtrFactory<Browser> confirm_close_factory_;	173 base::WeakPtrFactory<Browser> confirm_close_factory_;

171 scoped_nsobject<NSString> pending_window_title_;	174 scoped_nsobject<NSString> pending_window_title_;

172 ui::WindowShowState initial_show_state_;	175 ui::WindowShowState initial_show_state_;

173 NSInteger attention_request_id_; // identifier from requestUserAttention	176 NSInteger attention_request_id_; // identifier from requestUserAttention

174 };	177 };

175	178

176 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_	179 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_

OLD	NEW