Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1154)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 10494004: Implements a zoom icon in the Omnibox for Views. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed messed up indentation 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
OLDNEW
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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; 230 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
231 virtual StatusBubble* GetStatusBubble() OVERRIDE; 231 virtual StatusBubble* GetStatusBubble() OVERRIDE;
232 virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE; 232 virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE;
233 virtual void UpdateTitleBar() OVERRIDE; 233 virtual void UpdateTitleBar() OVERRIDE;
234 virtual void BookmarkBarStateChanged( 234 virtual void BookmarkBarStateChanged(
235 BookmarkBar::AnimateChangeType change_type) OVERRIDE; 235 BookmarkBar::AnimateChangeType change_type) OVERRIDE;
236 virtual void UpdateDevTools() OVERRIDE; 236 virtual void UpdateDevTools() OVERRIDE;
237 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE; 237 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;
238 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; 238 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
239 virtual void SetStarredState(bool is_starred) OVERRIDE; 239 virtual void SetStarredState(bool is_starred) OVERRIDE;
240 virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE; 240 virtual void SetZoomIconState(
241 ZoomController::ZoomIconState zoom_icon_state) OVERRIDE;
241 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE; 242 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;
242 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE; 243 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;
243 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 244 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
244 virtual gfx::Rect GetBounds() const OVERRIDE; 245 virtual gfx::Rect GetBounds() const OVERRIDE;
245 virtual bool IsMaximized() const OVERRIDE; 246 virtual bool IsMaximized() const OVERRIDE;
246 virtual bool IsMinimized() const OVERRIDE; 247 virtual bool IsMinimized() const OVERRIDE;
247 virtual void Maximize() OVERRIDE; 248 virtual void Maximize() OVERRIDE;
248 virtual void Minimize() OVERRIDE; 249 virtual void Minimize() OVERRIDE;
249 virtual void Restore() OVERRIDE; 250 virtual void Restore() OVERRIDE;
250 virtual void EnterFullscreen( 251 virtual void EnterFullscreen(
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 bool force_location_bar_focus_; 684 bool force_location_bar_focus_;
684 685
685 PendingFullscreenRequest fullscreen_request_; 686 PendingFullscreenRequest fullscreen_request_;
686 687
687 gfx::ScopedSysColorChangeListener color_change_listener_; 688 gfx::ScopedSysColorChangeListener color_change_listener_;
688 689
689 DISALLOW_COPY_AND_ASSIGN(BrowserView); 690 DISALLOW_COPY_AND_ASSIGN(BrowserView);
690 }; 691 };
691 692
692 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 693 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698