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

Unified Diff: ash/mus/bridge/wm_window_mus.h

Issue 2033843003: Makes ash/mus use RootWindowControllerCommon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mash_wm
Patch Set: merge fail 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.cc ('k') | ash/mus/container_ids.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_window_mus.h
diff --git a/ash/mus/bridge/wm_window_mus.h b/ash/mus/bridge/wm_window_mus.h
index cfd11b260c25852048aba43435a88ce58e0d3e3f..29ad94c13361025ed54df8faa776229605d6765b 100644
--- a/ash/mus/bridge/wm_window_mus.h
+++ b/ash/mus/bridge/wm_window_mus.h
@@ -7,6 +7,7 @@
#include <memory>
+#include "ash/common/shell_window_ids.h"
#include "ash/common/wm_window.h"
#include "base/macros.h"
#include "base/observer_list.h"
@@ -224,7 +225,7 @@ class WmWindowMus : public WmWindow, public ::mus::WindowObserver {
// The shell window id of this window. Shell window ids are defined in
// ash/common/shell_window_ids.h.
- int shell_window_id_ = -1;
+ int shell_window_id_ = kShellWindowId_Invalid;
std::unique_ptr<wm::WindowState> window_state_;
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/container_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698