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

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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/mus/bridge/wm_shell_mus.h ('k') | ash/rotator/screen_rotation_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 2eb8244f4595cf75df212f0633d2ed8c07892e00..0cba26cc5d913393ba86b6cd0519d972127d9ff9 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -5,6 +5,7 @@
#include "ash/mus/bridge/wm_shell_mus.h"
#include "ash/common/default_accessibility_delegate.h"
+#include "ash/common/display/display_info.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_observer.h"
#include "ash/common/shell_window_ids.h"
@@ -177,6 +178,12 @@ WmWindow* WmShellMus::GetRootWindowForNewWindows() {
return root_window_controllers_[0]->GetWindow();
}
+const DisplayInfo& WmShellMus::GetDisplayInfo(int64_t display_id) const {
+ NOTIMPLEMENTED();
+ static DisplayInfo fake_info;
+ return fake_info;
+}
+
bool WmShellMus::IsForceMaximizeOnFirstRun() {
NOTIMPLEMENTED();
return false;
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/rotator/screen_rotation_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698