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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10878013: Don't show the zoom bubble when the settings menu is showing on views or GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/settings/wrench/g 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 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::ZoomChangedForActiveTab(bool can_show_bubble) { 689 void BrowserView::ZoomChangedForActiveTab(bool can_show_bubble) {
690 GetLocationBarView()->ZoomChangedForActiveTab(can_show_bubble); 690 GetLocationBarView()->ZoomChangedForActiveTab(
691 can_show_bubble && !toolbar_->IsWrenchMenuShowing());
691 } 692 }
692 693
693 gfx::Rect BrowserView::GetRestoredBounds() const { 694 gfx::Rect BrowserView::GetRestoredBounds() const {
694 return frame_->GetRestoredBounds(); 695 return frame_->GetRestoredBounds();
695 } 696 }
696 697
697 gfx::Rect BrowserView::GetBounds() const { 698 gfx::Rect BrowserView::GetBounds() const {
698 return frame_->GetWindowBoundsInScreen(); 699 return frame_->GetWindowBoundsInScreen();
699 } 700 }
700 701
(...skipping 1897 matching lines...) Expand 10 before | Expand all | Expand 10 after
2598 2599
2599 Browser* modal_browser = 2600 Browser* modal_browser =
2600 browser::FindBrowserWithWebContents(active_dialog->web_contents()); 2601 browser::FindBrowserWithWebContents(active_dialog->web_contents());
2601 if (modal_browser && (browser_ != modal_browser)) { 2602 if (modal_browser && (browser_ != modal_browser)) {
2602 modal_browser->window()->FlashFrame(true); 2603 modal_browser->window()->FlashFrame(true);
2603 modal_browser->window()->Activate(); 2604 modal_browser->window()->Activate();
2604 } 2605 }
2605 2606
2606 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2607 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2607 } 2608 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698