OLD | NEW |
---|---|
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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
405 edit_bookmarks_enabled_.GetValue(); | 405 edit_bookmarks_enabled_.GetValue(); |
406 | 406 |
407 command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled); | 407 command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled); |
408 if (star_view_) | 408 if (star_view_) |
409 star_view_->SetVisible(star_enabled); | 409 star_view_->SetVisible(star_enabled); |
410 | 410 |
411 bool enabled = chrome_to_mobile_view_ && !model_->input_in_progress() && | 411 bool enabled = chrome_to_mobile_view_ && !model_->input_in_progress() && |
412 ChromeToMobileServiceFactory::GetForProfile(profile_)->HasMobiles(); | 412 ChromeToMobileServiceFactory::GetForProfile(profile_)->HasMobiles(); |
413 command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled); | 413 command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled); |
414 | 414 |
415 ZoomBubbleView::CloseBubble(); | |
Peter Kasting
2012/08/15 19:19:20
Nit: Put this next to zoom_view_->Update().
Kyle Horimoto
2012/08/15 19:29:15
Done.
| |
416 | |
415 // Don't Update in app launcher mode so that the location entry does not show | 417 // Don't Update in app launcher mode so that the location entry does not show |
416 // a URL or security background. | 418 // a URL or security background. |
417 if (mode_ != APP_LAUNCHER) | 419 if (mode_ != APP_LAUNCHER) |
418 location_entry_->Update(tab_for_state_restoring); | 420 location_entry_->Update(tab_for_state_restoring); |
419 OnChanged(); | 421 OnChanged(); |
420 } | 422 } |
421 | 423 |
422 void LocationBarView::UpdateContentSettingsIcons() { | 424 void LocationBarView::UpdateContentSettingsIcons() { |
423 RefreshContentSettingViews(); | 425 RefreshContentSettingViews(); |
424 | 426 |
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1499 } | 1501 } |
1500 | 1502 |
1501 void LocationBarView::CleanupFadeAnimation() { | 1503 void LocationBarView::CleanupFadeAnimation() { |
1502 // Since we're no longer animating we don't need our layer. | 1504 // Since we're no longer animating we don't need our layer. |
1503 SetPaintToLayer(false); | 1505 SetPaintToLayer(false); |
1504 // Bubble labels don't need a transparent background anymore. | 1506 // Bubble labels don't need a transparent background anymore. |
1505 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1507 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1506 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1508 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1507 } | 1509 } |
1508 #endif // USE_AURA | 1510 #endif // USE_AURA |
OLD | NEW |