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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 content_setting_views_.push_back(content_blocked_view); | 269 content_setting_views_.push_back(content_blocked_view); |
270 AddChildView(content_blocked_view); | 270 AddChildView(content_blocked_view); |
271 content_blocked_view->SetVisible(false); | 271 content_blocked_view->SetVisible(false); |
272 } | 272 } |
273 | 273 |
274 zoom_view_ = new ZoomView(model_); | 274 zoom_view_ = new ZoomView(model_); |
275 AddChildView(zoom_view_); | 275 AddChildView(zoom_view_); |
276 | 276 |
277 if (extensions::switch_utils::IsActionBoxEnabled()) { | 277 if (extensions::switch_utils::IsActionBoxEnabled()) { |
278 action_box_button_view_ = new ActionBoxButtonView( | 278 action_box_button_view_ = new ActionBoxButtonView( |
279 ExtensionSystem::Get(profile_)->extension_service()); | 279 extensions::ExtensionSystem::Get(profile_)->extension_service()); |
280 AddChildView(action_box_button_view_); | 280 AddChildView(action_box_button_view_); |
281 } else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) { | 281 } else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) { |
282 // Note: condition above means that the star and ChromeToMobile icons are | 282 // Note: condition above means that the star and ChromeToMobile icons are |
283 // hidden in popups and in the app launcher. | 283 // hidden in popups and in the app launcher. |
284 star_view_ = new StarView(command_updater_); | 284 star_view_ = new StarView(command_updater_); |
285 AddChildView(star_view_); | 285 AddChildView(star_view_); |
286 star_view_->SetVisible(true); | 286 star_view_->SetVisible(true); |
287 | 287 |
288 // Also disable Chrome To Mobile for off-the-record and non-synced profiles, | 288 // Also disable Chrome To Mobile for off-the-record and non-synced profiles, |
289 // or if the feature is disabled by a command line flag or chrome://flags. | 289 // or if the feature is disabled by a command line flag or chrome://flags. |
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1492 } | 1492 } |
1493 | 1493 |
1494 void LocationBarView::CleanupFadeAnimation() { | 1494 void LocationBarView::CleanupFadeAnimation() { |
1495 // Since we're no longer animating we don't need our layer. | 1495 // Since we're no longer animating we don't need our layer. |
1496 SetPaintToLayer(false); | 1496 SetPaintToLayer(false); |
1497 // Bubble labels don't need a transparent background anymore. | 1497 // Bubble labels don't need a transparent background anymore. |
1498 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1498 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1499 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); | 1499 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); |
1500 } | 1500 } |
1501 #endif // USE_AURA | 1501 #endif // USE_AURA |
OLD | NEW |