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

Side by Side Diff: ash/system/audio/volume_view.cc

Issue 2816193002: Introduce a type of View background that stays in sync with its host (Closed)
Patch Set: one more Created 3 years, 8 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
« no previous file with comments | « no previous file | ash/system/tray/system_tray.cc » ('j') | ui/views/view_observer.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/system/audio/volume_view.h" 5 #include "ash/system/audio/volume_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/metrics/user_metrics_action.h" 9 #include "ash/metrics/user_metrics_action.h"
10 #include "ash/resources/vector_icons/vector_icons.h" 10 #include "ash/resources/vector_icons/vector_icons.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 icon_ = new VolumeButton(owner, this); 124 icon_ = new VolumeButton(owner, this);
125 tri_view_->AddView(TriView::Container::START, icon_); 125 tri_view_->AddView(TriView::Container::START, icon_);
126 126
127 slider_ = TrayPopupUtils::CreateSlider(this); 127 slider_ = TrayPopupUtils::CreateSlider(this);
128 slider_->SetValue(CrasAudioHandler::Get()->GetOutputVolumePercent() / 100.0f); 128 slider_->SetValue(CrasAudioHandler::Get()->GetOutputVolumePercent() / 100.0f);
129 slider_->SetAccessibleName( 129 slider_->SetAccessibleName(
130 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VOLUME)); 130 l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VOLUME));
131 tri_view_->AddView(TriView::Container::CENTER, slider_); 131 tri_view_->AddView(TriView::Container::CENTER, slider_);
132 132
133 set_background(views::Background::CreateSolidBackground(kBackgroundColor)); 133 set_background(views::Background::CreateThemedSolidBackground(
134 this, ui::NativeTheme::kColorId_BubbleBackground));
134 135
135 if (!is_default_view_) { 136 if (!is_default_view_) {
136 tri_view_->SetContainerVisible(TriView::Container::END, false); 137 tri_view_->SetContainerVisible(TriView::Container::END, false);
137 Update(); 138 Update();
138 return; 139 return;
139 } 140 }
140 141
141 more_button_ = new ButtonListenerActionableView( 142 more_button_ = new ButtonListenerActionableView(
142 owner_, TrayPopupInkDropStyle::INSET_BOUNDS, this); 143 owner_, TrayPopupInkDropStyle::INSET_BOUNDS, this);
143 TrayPopupUtils::ConfigureContainer(TriView::Container::END, more_button_); 144 TrayPopupUtils::ConfigureContainer(TriView::Container::END, more_button_);
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 if (new_volume > current_volume) 255 if (new_volume > current_volume)
255 HandleVolumeUp(new_volume); 256 HandleVolumeUp(new_volume);
256 else 257 else
257 HandleVolumeDown(new_volume); 258 HandleVolumeDown(new_volume);
258 } 259 }
259 icon_->Update(); 260 icon_->Update();
260 } 261 }
261 262
262 } // namespace tray 263 } // namespace tray
263 } // namespace ash 264 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/system_tray.cc » ('j') | ui/views/view_observer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698