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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_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
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/toolbar_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 chrome::ShowBookmarkBubbleView(star_view_, profile_, url, newly_bookmarked); 521 chrome::ShowBookmarkBubbleView(star_view_, profile_, url, newly_bookmarked);
522 } 522 }
523 523
524 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) { 524 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
525 DCHECK(zoom_view_); 525 DCHECK(zoom_view_);
526 RefreshZoomView(); 526 RefreshZoomView();
527 527
528 Layout(); 528 Layout();
529 SchedulePaint(); 529 SchedulePaint();
530 530
531 // TODO(dbeam): don't show a bubble when the wrench menu is showing.
532 if (can_show_bubble && zoom_view_->visible()) 531 if (can_show_bubble && zoom_view_->visible())
533 ZoomBubbleView::ShowBubble(zoom_view_, GetTabContents(), true); 532 ZoomBubbleView::ShowBubble(zoom_view_, GetTabContents(), true);
534 } 533 }
535 534
536 void LocationBarView::RefreshZoomView() { 535 void LocationBarView::RefreshZoomView() {
537 DCHECK(zoom_view_); 536 DCHECK(zoom_view_);
538 TabContents* tab_contents = GetTabContents(); 537 TabContents* tab_contents = GetTabContents();
539 if (tab_contents) 538 if (tab_contents)
540 zoom_view_->Update(tab_contents->zoom_controller()); 539 zoom_view_->Update(tab_contents->zoom_controller());
541 } 540 }
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 } 1515 }
1517 1516
1518 void LocationBarView::CleanupFadeAnimation() { 1517 void LocationBarView::CleanupFadeAnimation() {
1519 // Since we're no longer animating we don't need our layer. 1518 // Since we're no longer animating we don't need our layer.
1520 SetPaintToLayer(false); 1519 SetPaintToLayer(false);
1521 // Bubble labels don't need a transparent background anymore. 1520 // Bubble labels don't need a transparent background anymore.
1522 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1521 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1523 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1522 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1524 } 1523 }
1525 #endif // USE_AURA 1524 #endif // USE_AURA
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/toolbar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698