summaryrefslogtreecommitdiffstats
path: root/chrome/test/base
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 13:47:19 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 13:47:19 +0000
commit721c0c052aec4079eca2ff8fb9a786df060369fe (patch)
treedb48606059f3a527002de1c9b4a5d33eac69afca /chrome/test/base
parenta43b9e5d49784774312456d457f998ae1dc889b8 (diff)
downloadchromium_src-721c0c052aec4079eca2ff8fb9a786df060369fe.zip
chromium_src-721c0c052aec4079eca2ff8fb9a786df060369fe.tar.gz
chromium_src-721c0c052aec4079eca2ff8fb9a786df060369fe.tar.bz2
Refactor browser window zoom handling and enable zoom icon on all platforms.
On all platforms: After this CL there should be zoom icon in the omnibox when on a page with non-default zoom (- for less than default, + for more than default). If the zoom is reset with Ctrl+0, no bubble should show up and the icon should disappear. If tabs with different zooms are switched between, the zoom icon should update itself for each tab without showing a bubble. On Views and GTK: While changing zoom with Ctrl +/-, a zoom bubble should show up if you zoomed *to* a non-default level. If you quickly change to a different tab after changing the zoom level, the bubble should disappear. BUG=86817,128817 TEST=Compiles, passes tests, doesn't regress current zoom functionality. TODO=Zoom *bubble* on Mac. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10736028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base')
-rw-r--r--chrome/test/base/test_browser_window.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index 2317779..7f8e078 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -44,9 +44,7 @@ class TestBrowserWindow : public BrowserWindow {
virtual void SetDevToolsDockSide(DevToolsDockSide side) OVERRIDE {}
virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE {}
virtual void SetStarredState(bool is_starred) OVERRIDE {}
- virtual void SetZoomIconState(ZoomController::ZoomIconState state) OVERRIDE {}
- virtual void SetZoomIconTooltipPercent(int zoom_percent) OVERRIDE {}
- virtual void ShowZoomBubble(int zoom_percent) OVERRIDE {}
+ virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE {}
virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
virtual gfx::Rect GetBounds() const OVERRIDE;
virtual bool IsMaximized() const OVERRIDE;