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

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

Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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 | « ash/system/audio/tray_audio_unittest.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | no next file with comments »
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/common/metrics/user_metrics_action.h"
10 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/metrics/user_metrics_action.h"
11 #include "ash/resources/vector_icons/vector_icons.h" 11 #include "ash/resources/vector_icons/vector_icons.h"
12 #include "ash/strings/grit/ash_strings.h" 12 #include "ash/strings/grit/ash_strings.h"
13 #include "ash/system/audio/tray_audio_delegate.h" 13 #include "ash/system/audio/tray_audio_delegate.h"
14 #include "ash/system/tray/actionable_view.h" 14 #include "ash/system/tray/actionable_view.h"
15 #include "ash/system/tray/system_tray_item.h" 15 #include "ash/system/tray/system_tray_item.h"
16 #include "ash/system/tray/tray_constants.h" 16 #include "ash/system/tray/tray_constants.h"
17 #include "ash/system/tray/tray_popup_item_container.h" 17 #include "ash/system/tray/tray_popup_item_container.h"
18 #include "ash/system/tray/tray_popup_utils.h" 18 #include "ash/system/tray/tray_popup_utils.h"
19 #include "ash/system/tray/tri_view.h" 19 #include "ash/system/tray/tri_view.h"
20 #include "ui/accessibility/ax_node_data.h" 20 #include "ui/accessibility/ax_node_data.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 if (new_volume > current_volume) 239 if (new_volume > current_volume)
240 HandleVolumeUp(new_volume); 240 HandleVolumeUp(new_volume);
241 else 241 else
242 HandleVolumeDown(new_volume); 242 HandleVolumeDown(new_volume);
243 } 243 }
244 icon_->Update(); 244 icon_->Update();
245 } 245 }
246 246
247 } // namespace tray 247 } // namespace tray
248 } // namespace ash 248 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/audio/tray_audio_unittest.cc ('k') | ash/system/brightness/tray_brightness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698