|
Revert 152080 - 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
TBR=dbeam@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=152087
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+235 lines, -265 lines) |
Patch |
 |
M |
chrome/browser/ui/browser.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/browser.cc
|
View
|
|
2 chunks |
+13 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/browser_command_controller.cc
|
View
|
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/browser_window.h
|
View
|
|
2 chunks |
+9 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/browser_window_cocoa.h
|
View
|
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
View
|
|
1 chunk |
+10 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/browser_window_controller.h
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
MM |
chrome/browser/ui/cocoa/browser_window_controller.mm
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
View
|
|
5 chunks |
+0 lines, -19 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
View
|
|
9 chunks |
+12 lines, -28 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
|
View
|
|
1 chunk |
+0 lines, -43 lines |
0 comments
|
Download
|
 |
D |
chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm
|
View
|
|
1 chunk |
+0 lines, -49 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/toolbar/toolbar_controller.h
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/gtk/browser_window_gtk.h
|
View
|
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/gtk/browser_window_gtk.cc
|
View
|
|
1 chunk |
+10 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/gtk/location_bar_view_gtk.h
|
View
|
|
2 chunks |
+8 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/gtk/location_bar_view_gtk.cc
|
View
|
|
3 chunks |
+21 lines, -19 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/panels/panel_browser_window.h
|
View
|
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/panels/panel_browser_window.cc
|
View
|
|
1 chunk |
+10 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/frame/browser_view.h
|
View
|
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/frame/browser_view.cc
|
View
|
|
1 chunk |
+11 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/location_bar/location_bar_view.h
|
View
|
|
3 chunks |
+9 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/location_bar/location_bar_view.cc
|
View
|
|
2 chunks |
+10 lines, -13 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/location_bar/zoom_view.h
|
View
|
|
4 chunks |
+11 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/views/location_bar/zoom_view.cc
|
View
|
|
3 chunks |
+30 lines, -15 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/zoom/zoom_controller.h
|
View
|
|
2 chunks |
+12 lines, -8 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/zoom/zoom_controller.cc
|
View
|
|
3 chunks |
+27 lines, -15 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/zoom/zoom_observer.h
|
View
|
|
1 chunk |
+9 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/chrome_browser.gypi
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/test_browser_window.h
|
View
|
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|