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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/system/audio/tray_audio.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/display/display_info_unittest.cc ('k') | ash/common/wm_shell.h » ('j') | ash/common/wm_shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/audio/tray_audio.cc
diff --git a/ash/common/system/audio/tray_audio.cc b/ash/common/system/audio/tray_audio.cc
index 8ff0987aadc01be209d8ef02a09d83a1fd738b8a..16476e9112fa89a3ad516434b06e0876005ddbac 100644
--- a/ash/common/system/audio/tray_audio.cc
+++ b/ash/common/system/audio/tray_audio.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "ash/common/ash_constants.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/system/audio/tray_audio_delegate.h"
#include "ash/common/system/audio/volume_view.h"
#include "ash/common/system/tray/actionable_view.h"
@@ -26,6 +25,7 @@
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_info.h"
#include "ui/display/screen.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
@@ -143,7 +143,7 @@ void TrayAudio::ChangeInternalSpeakerChannelMode() {
system::TrayAudioDelegate::AudioChannelMode channel_mode =
system::TrayAudioDelegate::NORMAL;
if (display::Display::HasInternalDisplay()) {
- const DisplayInfo& display_info =
+ const ui::DisplayInfo& display_info =
WmShell::Get()->GetDisplayInfo(display::Display::InternalDisplayId());
if (display_info.GetActiveRotation() == display::Display::ROTATE_180)
channel_mode = system::TrayAudioDelegate::LEFT_RIGHT_SWAPPED;
« no previous file with comments | « ash/common/display/display_info_unittest.cc ('k') | ash/common/wm_shell.h » ('j') | ash/common/wm_shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698