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

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: Created 8 years, 5 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 241 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
242 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; 242 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
243 virtual StatusBubble* GetStatusBubble() OVERRIDE; 243 virtual StatusBubble* GetStatusBubble() OVERRIDE;
244 virtual void UpdateTitleBar() OVERRIDE; 244 virtual void UpdateTitleBar() OVERRIDE;
245 virtual void BookmarkBarStateChanged( 245 virtual void BookmarkBarStateChanged(
246 BookmarkBar::AnimateChangeType change_type) OVERRIDE; 246 BookmarkBar::AnimateChangeType change_type) OVERRIDE;
247 virtual void UpdateDevTools() OVERRIDE; 247 virtual void UpdateDevTools() OVERRIDE;
248 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE; 248 virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE;
249 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; 249 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
250 virtual void SetStarredState(bool is_starred) OVERRIDE; 250 virtual void SetStarredState(bool is_starred) OVERRIDE;
251 virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE; 251 virtual void SetZoomIconState(
252 ZoomController::ZoomIconState zoom_icon_state) OVERRIDE;
252 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE; 253 virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE;
253 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE; 254 virtual void ShowZoomBubble(int zoom_percent) OVERRIDE;
254 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 255 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
255 virtual gfx::Rect GetBounds() const OVERRIDE; 256 virtual gfx::Rect GetBounds() const OVERRIDE;
256 virtual bool IsMaximized() const OVERRIDE; 257 virtual bool IsMaximized() const OVERRIDE;
257 virtual bool IsMinimized() const OVERRIDE; 258 virtual bool IsMinimized() const OVERRIDE;
258 virtual void Maximize() OVERRIDE; 259 virtual void Maximize() OVERRIDE;
259 virtual void Minimize() OVERRIDE; 260 virtual void Minimize() OVERRIDE;
260 virtual void Restore() OVERRIDE; 261 virtual void Restore() OVERRIDE;
261 virtual void EnterFullscreen( 262 virtual void EnterFullscreen(
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 gfx::ScopedSysColorChangeListener color_change_listener_; 707 gfx::ScopedSysColorChangeListener color_change_listener_;
707 708
708 #if defined(USE_AURA) 709 #if defined(USE_AURA)
709 scoped_ptr<SearchViewController> search_view_controller_; 710 scoped_ptr<SearchViewController> search_view_controller_;
710 #endif 711 #endif
711 712
712 DISALLOW_COPY_AND_ASSIGN(BrowserView); 713 DISALLOW_COPY_AND_ASSIGN(BrowserView);
713 }; 714 };
714 715
715 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 716 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698