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

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 10736028: Refactor browser window zoom handling and enable zoom icon on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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 | Annotate | Revision Log
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 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 // the animations are running slowly and this function is called on 832 // the animations are running slowly and this function is called on
833 // a timer through LoadingAnimationCallback. 833 // a timer through LoadingAnimationCallback.
834 titlebar_->UpdateThrobber(web_contents); 834 titlebar_->UpdateThrobber(web_contents);
835 } 835 }
836 } 836 }
837 837
838 void BrowserWindowGtk::SetStarredState(bool is_starred) { 838 void BrowserWindowGtk::SetStarredState(bool is_starred) {
839 toolbar_->GetLocationBarView()->SetStarred(is_starred); 839 toolbar_->GetLocationBarView()->SetStarred(is_starred);
840 } 840 }
841 841
842 void BrowserWindowGtk::SetZoomIconState(ZoomController::ZoomIconState state) { 842 void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
843 toolbar_->GetLocationBarView()->SetZoomIconState(state); 843 toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble);
844 }
845
846 void BrowserWindowGtk::SetZoomIconTooltipPercent(int zoom_percent) {
847 toolbar_->GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent);
848 }
849
850 void BrowserWindowGtk::ShowZoomBubble(int zoom_percent) {
851 toolbar_->GetLocationBarView()->ShowZoomBubble(zoom_percent);
852 } 844 }
853 845
854 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const { 846 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const {
855 return restored_bounds_; 847 return restored_bounds_;
856 } 848 }
857 849
858 gfx::Rect BrowserWindowGtk::GetBounds() const { 850 gfx::Rect BrowserWindowGtk::GetBounds() const {
859 return bounds_; 851 return bounds_;
860 } 852 }
861 853
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 wm_type == ui::WM_OPENBOX || 2481 wm_type == ui::WM_OPENBOX ||
2490 wm_type == ui::WM_XFWM4); 2482 wm_type == ui::WM_XFWM4);
2491 } 2483 }
2492 2484
2493 // static 2485 // static
2494 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 2486 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
2495 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); 2487 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
2496 browser_window_gtk->Init(); 2488 browser_window_gtk->Init();
2497 return browser_window_gtk; 2489 return browser_window_gtk;
2498 } 2490 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_window_gtk.h ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698