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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 // Loads are now complete, update the state if a task was scheduled. 679 // Loads are now complete, update the state if a task was scheduled.
680 LoadingAnimationCallback(); 680 LoadingAnimationCallback();
681 } 681 }
682 } 682 }
683 } 683 }
684 684
685 void BrowserView::SetStarredState(bool is_starred) { 685 void BrowserView::SetStarredState(bool is_starred) {
686 GetLocationBarView()->SetStarToggled(is_starred); 686 GetLocationBarView()->SetStarToggled(is_starred);
687 } 687 }
688 688
689 void BrowserView::SetZoomIconState( 689 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
690 ZoomController::ZoomIconState zoom_icon_state) { 690 GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble);
691 GetLocationBarView()->SetZoomIconState(zoom_icon_state);
692 }
693
694 void BrowserView::SetZoomIconTooltipPercent(int zoom_percent) {
695 GetLocationBarView()->SetZoomIconTooltipPercent(zoom_percent);
696 }
697
698 void BrowserView::ShowZoomBubble(int zoom_percent) {
699 GetLocationBarView()->ShowZoomBubble(zoom_percent);
700 } 691 }
701 692
702 gfx::Rect BrowserView::GetRestoredBounds() const { 693 gfx::Rect BrowserView::GetRestoredBounds() const {
703 return frame_->GetRestoredBounds(); 694 return frame_->GetRestoredBounds();
704 } 695 }
705 696
706 gfx::Rect BrowserView::GetBounds() const { 697 gfx::Rect BrowserView::GetBounds() const {
707 return frame_->GetWindowBoundsInScreen(); 698 return frame_->GetWindowBoundsInScreen();
708 } 699 }
709 700
(...skipping 1892 matching lines...) Expand 10 before | Expand all | Expand 10 after
2602 2593
2603 Browser* modal_browser = 2594 Browser* modal_browser =
2604 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2595 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2605 if (modal_browser && (browser_ != modal_browser)) { 2596 if (modal_browser && (browser_ != modal_browser)) {
2606 modal_browser->window()->FlashFrame(true); 2597 modal_browser->window()->FlashFrame(true);
2607 modal_browser->window()->Activate(); 2598 modal_browser->window()->Activate();
2608 } 2599 }
2609 2600
2610 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2601 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2611 } 2602 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698