| 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 ContentSettingImageView* content_blocked_view = | 268 ContentSettingImageView* content_blocked_view = |
| 269 new ContentSettingImageView(static_cast<ContentSettingsType>(i), this); | 269 new ContentSettingImageView(static_cast<ContentSettingsType>(i), this); |
| 270 content_setting_views_.push_back(content_blocked_view); | 270 content_setting_views_.push_back(content_blocked_view); |
| 271 AddChildView(content_blocked_view); | 271 AddChildView(content_blocked_view); |
| 272 content_blocked_view->SetVisible(false); | 272 content_blocked_view->SetVisible(false); |
| 273 } | 273 } |
| 274 | 274 |
| 275 zoom_view_ = new ZoomView(model_, delegate_); | 275 zoom_view_ = new ZoomView(model_, delegate_); |
| 276 AddChildView(zoom_view_); | 276 AddChildView(zoom_view_); |
| 277 | 277 |
| 278 if (extensions::switch_utils::IsActionBoxEnabled() && browser_) { | 278 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox) && |
| 279 browser_) { |
| 279 action_box_button_view_ = new ActionBoxButtonView(browser_, profile_); | 280 action_box_button_view_ = new ActionBoxButtonView(browser_, profile_); |
| 280 AddChildView(action_box_button_view_); | 281 AddChildView(action_box_button_view_); |
| 281 } else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) { | 282 } else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) { |
| 282 // Note: condition above means that the star and ChromeToMobile icons are | 283 // Note: condition above means that the star and ChromeToMobile icons are |
| 283 // hidden in popups and in the app launcher. | 284 // hidden in popups and in the app launcher. |
| 284 star_view_ = new StarView(command_updater_); | 285 star_view_ = new StarView(command_updater_); |
| 285 AddChildView(star_view_); | 286 AddChildView(star_view_); |
| 286 star_view_->SetVisible(true); | 287 star_view_->SetVisible(true); |
| 287 | 288 |
| 288 // Also disable Chrome To Mobile for off-the-record and non-synced profiles, | 289 // Also disable Chrome To Mobile for off-the-record and non-synced profiles, |
| (...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |