| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/common/system/chromeos/audio/volume_view.h" | 5 #include "ash/common/system/chromeos/audio/volume_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/common/metrics/user_metrics_action.h" | 9 #include "ash/common/metrics/user_metrics_action.h" |
| 10 #include "ash/common/strings/grit/ash_strings.h" | 10 #include "ash/common/strings/grit/ash_strings.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 if (!is_default_view_) { | 126 if (!is_default_view_) { |
| 127 tri_view_->SetContainerVisible(TriView::Container::END, false); | 127 tri_view_->SetContainerVisible(TriView::Container::END, false); |
| 128 Update(); | 128 Update(); |
| 129 return; | 129 return; |
| 130 } | 130 } |
| 131 | 131 |
| 132 more_button_ = new ButtonListenerActionableView( | 132 more_button_ = new ButtonListenerActionableView( |
| 133 owner_, TrayPopupInkDropStyle::INSET_BOUNDS, this); | 133 owner_, TrayPopupInkDropStyle::INSET_BOUNDS, this); |
| 134 TrayPopupUtils::ConfigureContainer(TriView::Container::END, more_button_); | 134 TrayPopupUtils::ConfigureContainer(TriView::Container::END, more_button_); |
| 135 |
| 135 more_button_->SetInkDropMode(views::InkDropHostView::InkDropMode::ON); | 136 more_button_->SetInkDropMode(views::InkDropHostView::InkDropMode::ON); |
| 136 more_button_->SetBorder(views::CreateEmptyBorder(gfx::Insets( | 137 more_button_->SetBorder(views::CreateEmptyBorder(gfx::Insets( |
| 137 0, GetTrayConstant(TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET)))); | 138 0, kTrayPopupButtonEndMargin))); |
| 138 tri_view_->AddView(TriView::Container::END, more_button_); | 139 tri_view_->AddView(TriView::Container::END, more_button_); |
| 139 | 140 |
| 140 device_type_ = TrayPopupUtils::CreateMoreImageView(); | 141 device_type_ = TrayPopupUtils::CreateMoreImageView(); |
| 141 device_type_->SetVisible(false); | 142 device_type_->SetVisible(false); |
| 142 more_button_->AddChildView(device_type_); | 143 more_button_->AddChildView(device_type_); |
| 143 | 144 |
| 144 more_button_->AddChildView(TrayPopupUtils::CreateMoreImageView()); | 145 more_button_->AddChildView(TrayPopupUtils::CreateMoreImageView()); |
| 145 | 146 |
| 146 Update(); | 147 Update(); |
| 147 } | 148 } |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 if (new_volume > current_volume) | 239 if (new_volume > current_volume) |
| 239 HandleVolumeUp(new_volume); | 240 HandleVolumeUp(new_volume); |
| 240 else | 241 else |
| 241 HandleVolumeDown(new_volume); | 242 HandleVolumeDown(new_volume); |
| 242 } | 243 } |
| 243 icon_->Update(); | 244 icon_->Update(); |
| 244 } | 245 } |
| 245 | 246 |
| 246 } // namespace tray | 247 } // namespace tray |
| 247 } // namespace ash | 248 } // namespace ash |
| OLD | NEW |