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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 10854169: Closes zoom bubble when tab is changed within a browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed non-NULL check 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 | « no previous file | no next file » | 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/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 StartFadeAnimation(); 391 StartFadeAnimation();
392 } else { 392 } else {
393 // Cancel any pending animations; switch to the final state immediately. 393 // Cancel any pending animations; switch to the final state immediately.
394 StopFadeAnimation(); 394 StopFadeAnimation();
395 } 395 }
396 #endif 396 #endif
397 } 397 }
398 398
399 void LocationBarView::Update(const WebContents* tab_for_state_restoring) { 399 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
400 RefreshContentSettingViews(); 400 RefreshContentSettingViews();
401 ZoomBubbleView::CloseBubble();
401 zoom_view_->Update(); 402 zoom_view_->Update();
402 RefreshPageActionViews(); 403 RefreshPageActionViews();
403 404
404 bool star_enabled = star_view_ && !model_->input_in_progress() && 405 bool star_enabled = star_view_ && !model_->input_in_progress() &&
405 edit_bookmarks_enabled_.GetValue(); 406 edit_bookmarks_enabled_.GetValue();
406 407
407 command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled); 408 command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
408 if (star_view_) 409 if (star_view_)
409 star_view_->SetVisible(star_enabled); 410 star_view_->SetVisible(star_enabled);
410 411
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 } 1500 }
1500 1501
1501 void LocationBarView::CleanupFadeAnimation() { 1502 void LocationBarView::CleanupFadeAnimation() {
1502 // Since we're no longer animating we don't need our layer. 1503 // Since we're no longer animating we don't need our layer.
1503 SetPaintToLayer(false); 1504 SetPaintToLayer(false);
1504 // Bubble labels don't need a transparent background anymore. 1505 // Bubble labels don't need a transparent background anymore.
1505 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1506 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1506 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1507 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1507 } 1508 }
1508 #endif // USE_AURA 1509 #endif // USE_AURA
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698