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

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

Issue 2215223004: mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore screen bounds conversion for app list. 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/mus/bridge/wm_shell_mus.h ('k') | ash/screen_util.h » ('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 c83dc91f7f330a379746ce0f2ab0da8f858b72ff..7caf2dc199dd5b4e8f1290e79522abc7d055d7cc 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -33,6 +33,7 @@
#include "services/ui/common/util.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
+#include "ui/display/screen.h"
namespace ash {
namespace mus {
@@ -210,17 +211,29 @@ WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
}
const DisplayInfo& WmShellMus::GetDisplayInfo(int64_t display_id) const {
+ // TODO(mash): implement http://crbug.com/622480.
NOTIMPLEMENTED();
static DisplayInfo fake_info;
return fake_info;
}
bool WmShellMus::IsActiveDisplayId(int64_t display_id) const {
- // TODO: implement http://crbug.com/622480.
+ // TODO(mash): implement http://crbug.com/622480.
NOTIMPLEMENTED();
return true;
}
+display::Display WmShellMus::GetFirstDisplay() const {
+ // TODO(mash): implement http://crbug.com/622480.
+ NOTIMPLEMENTED();
+ return display::Screen::GetScreen()->GetPrimaryDisplay();
+}
+
+bool WmShellMus::IsInUnifiedMode() const {
+ // TODO(mash): implement http://crbug.com/622480.
+ return false;
+}
+
bool WmShellMus::IsForceMaximizeOnFirstRun() {
NOTIMPLEMENTED();
return false;
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/screen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698