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

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: Addressed comments, improved code executed when a new bubble is opened when another already exists 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 234 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
235 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; 235 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
236 virtual StatusBubble* GetStatusBubble() OVERRIDE; 236 virtual StatusBubble* GetStatusBubble() OVERRIDE;
237 virtual void UpdateTitleBar() OVERRIDE; 237 virtual void UpdateTitleBar() OVERRIDE;
238 virtual void BookmarkBarStateChanged( 238 virtual void BookmarkBarStateChanged(
239 BookmarkBar::AnimateChangeType change_type) OVERRIDE; 239 BookmarkBar::AnimateChangeType change_type) OVERRIDE;
240 virtual void UpdateDevTools() OVERRIDE; 240 virtual void UpdateDevTools() OVERRIDE;
241 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE; 241 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;
242 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; 242 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
243 virtual void SetStarredState(bool is_starred) OVERRIDE; 243 virtual void SetStarredState(bool is_starred) OVERRIDE;
244 virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE; 244 virtual void SetZoomIconState(
245 ZoomController::ZoomIconState zoom_icon_state) OVERRIDE;
245 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE; 246 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;
246 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE; 247 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;
247 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 248 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
248 virtual gfx::Rect GetBounds() const OVERRIDE; 249 virtual gfx::Rect GetBounds() const OVERRIDE;
249 virtual bool IsMaximized() const OVERRIDE; 250 virtual bool IsMaximized() const OVERRIDE;
250 virtual bool IsMinimized() const OVERRIDE; 251 virtual bool IsMinimized() const OVERRIDE;
251 virtual void Maximize() OVERRIDE; 252 virtual void Maximize() OVERRIDE;
252 virtual void Minimize() OVERRIDE; 253 virtual void Minimize() OVERRIDE;
253 virtual void Restore() OVERRIDE; 254 virtual void Restore() OVERRIDE;
254 virtual void EnterFullscreen( 255 virtual void EnterFullscreen(
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 gfx::ScopedSysColorChangeListener color_change_listener_; 703 gfx::ScopedSysColorChangeListener color_change_listener_;
703 704
704 #if defined(USE_AURA) 705 #if defined(USE_AURA)
705 scoped_ptr<SearchViewController> search_view_controller_; 706 scoped_ptr<SearchViewController> search_view_controller_;
706 #endif 707 #endif
707 708
708 DISALLOW_COPY_AND_ASSIGN(BrowserView); 709 DISALLOW_COPY_AND_ASSIGN(BrowserView);
709 }; 710 };
710 711
711 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 712 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698