aura: Touch state file after first browser is ready.

This creates a chromeos::InitialBrowserWindowObserver class
for Aura that replicates some behavior for tests that's
currently performed by the X window manager: when the first
browser window is created,
/var/run/state/windowmanager/initial-chrome-window-mapped is
touched (the window manager actually writes the window's ID
to the file, but that doesn't make sense under Aura and
luckily doesn't appear to be depended on by any tests).

This fixes Chrome OS's security_ProfilePermissions.BWSI and
security_ProfilePermissions.login autotests, which otherwise
time out when run against an Aura build.

I'm also moving existing X-window-manager-related files that
are currently in the chromeos/ directory to
chromeos/legacy_window_manager/.

BUG=chromium-os:22974,chromium-os:22896
TEST=manual: observed that tests no longer time out

Review URL: http://codereview.chromium.org/8539051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110508 0039d316-1c4b-4281-b951-d872f2087c98

30 files changed, 147 insertions, 40 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index b09aa5d..8c39e33 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -34,6 +34,10 @@
 #include <gtk/gtk.h>
 #endif
 
+#if defined(USE_AURA)
+#include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.h"
+#endif
+
 class MessageLoopObserver : public MessageLoopForUI::Observer {
 #if defined(TOUCH_UI) || defined(USE_AURA)
   virtual base::EventStatus WillProcessEvent(
@@ -196,10 +200,15 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
   // detector starts to monitor changes from the update engine.
   UpgradeDetectorChromeos::GetInstance()->Init();
 
-  // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
-  // Enable Num Lock on X start up.
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
-    chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
-        SetNumLockEnabled(true);
+    // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
+    // Enable Num Lock on X start up.
+      chromeos::input_method::InputMethodManager::GetInstance()->
+          GetXKeyboard()->SetNumLockEnabled(true);
+
+#if defined(USE_AURA)
+      initial_browser_window_observer_.reset(
+          new chromeos::InitialBrowserWindowObserver);
+#endif
   }
 }
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index 5190db1..ddd17be 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -11,6 +11,10 @@
 namespace chromeos {
 class BrightnessObserver;
 class SessionManagerObserver;
+
+#if defined(USE_AURA)
+class InitialBrowserWindowObserver;
+#endif
 }  // namespace chromeos
 
 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
@@ -28,6 +32,11 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
   scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
   scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_;
 
+#if defined(USE_AURA)
+  scoped_ptr<chromeos::InitialBrowserWindowObserver>
+      initial_browser_window_observer_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
 };
 
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index 489fa04..f3a99e4 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -47,7 +47,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/chromeos/frame/layout_mode_button.cc b/chrome/browser/chromeos/frame/layout_mode_button.cc
index 1707324..9c608ff 100644
--- a/chrome/browser/chromeos/frame/layout_mode_button.cc
+++ b/chrome/browser/chromeos/frame/layout_mode_button.cc
@@ -17,7 +17,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 7939340..43bfcba 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -37,7 +37,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 #if defined(TOUCH_UI)
diff --git a/chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc b/chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc
new file mode 100644
index 0000000..6440027
--- /dev/null
+++ b/chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc
@@ -0,0 +1,38 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.h"
+
+#include "base/file_path.h"
+#include "base/file_util.h"
+#include "base/logging.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/public/browser/notification_service.h"
+
+namespace {
+
+// Taken from the --initial_chrome_window_mapped_file flag in the chromeos-wm
+// command line: http://goo.gl/uLwIL
+const char kInitialWindowFile[] =
+    "/var/run/state/windowmanager/initial-chrome-window-mapped";
+
+}  // namespace
+
+namespace chromeos {
+
+InitialBrowserWindowObserver::InitialBrowserWindowObserver() {
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_BROWSER_WINDOW_READY,
+                 content::NotificationService::AllSources());
+}
+
+void InitialBrowserWindowObserver::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  registrar_.RemoveAll();
+  file_util::WriteFile(FilePath(kInitialWindowFile), "", 0);
+}
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.h b/chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.h
new file mode 100644
index 0000000..3e3e2df
--- /dev/null
+++ b/chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.h
@@ -0,0 +1,47 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_INITIAL_BROWSER_WINDOW_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_INITIAL_BROWSER_WINDOW_OBSERVER_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+
+namespace content {
+class NotificationDetails;
+class NotificationSource;
+}
+
+namespace chromeos {
+
+// The old X window manager for Chrome OS touches a file under /var/run/state
+// when it sees the first Chrome browser window get mapped post-login.  Tests
+// then watch for this file to determine when login is completed.  There's no X
+// window manager running for Aura builds, so we make Chrome replicate this
+// behavior itself.
+//
+// TODO(derat): Once Aura is fully in use in Chrome OS, remove this and make
+// tests instead use pyauto to communicate with Chrome.
+class InitialBrowserWindowObserver : public content::NotificationObserver {
+ public:
+  InitialBrowserWindowObserver();
+  ~InitialBrowserWindowObserver() {}
+
+  // content::NotificationObserver implementation:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+ private:
+  content::NotificationRegistrar registrar_;
+
+  DISALLOW_COPY_AND_ASSIGN(InitialBrowserWindowObserver);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_INITIAL_BROWSER_WINDOW_OBSERVER_H_
diff --git a/chrome/browser/chromeos/wm_ipc.cc b/chrome/browser/chromeos/legacy_window_manager/wm_ipc.cc
index 0f71a642..d800159 100644
--- a/chrome/browser/chromeos/wm_ipc.cc
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_ipc.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 
 #include <gdk/gdkx.h>
 extern "C" {
diff --git a/chrome/browser/chromeos/wm_ipc.h b/chrome/browser/chromeos/legacy_window_manager/wm_ipc.h
index 5e70b38..d4a48b4 100644
--- a/chrome/browser/chromeos/wm_ipc.h
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_ipc.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WM_IPC_H_
-#define CHROME_BROWSER_CHROMEOS_WM_IPC_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_WM_IPC_H_
+#define CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_WM_IPC_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -178,4 +178,4 @@ class WmIpc {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WM_IPC_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_WM_IPC_H_
diff --git a/chrome/browser/chromeos/wm_message_listener.cc b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc
index 89db223..42d9613 100644
--- a/chrome/browser/chromeos/wm_message_listener.cc
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/wm_message_listener.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/wm_message_listener.h b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
index 8921f35..cdb2462 100644
--- a/chrome/browser/chromeos/wm_message_listener.h
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WM_MESSAGE_LISTENER_H_
-#define CHROME_BROWSER_CHROMEOS_WM_MESSAGE_LISTENER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_WM_MESSAGE_LISTENER_H_
+#define CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_WM_MESSAGE_LISTENER_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -11,7 +11,7 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 
 namespace chromeos {
 
@@ -64,4 +64,4 @@ class WmMessageListener : public MessageLoopForUI::Observer {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_WM_MESSAGE_LISTENER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LEGACY_WINDOW_MANAGER_WM_MESSAGE_LISTENER_H_
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 0835444..1535b38 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -36,7 +36,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 using views::Widget;
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index d62b65e..eb5825a 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -37,7 +37,7 @@
 #include "unicode/timezone.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index a95efe9..52610e9 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -28,7 +28,7 @@
 #include "ui/gfx/rect.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_message_listener.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h"
 #endif
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 5a68498..e728b90 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -47,7 +47,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc
index d4741ba..a004341 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.cc
+++ b/chrome/browser/chromeos/login/screen_locker_views.cc
@@ -33,7 +33,7 @@
 #include "ui/gfx/screen.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index d4d598f..eb99e69 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -49,7 +49,7 @@
 #include "ui/gfx/codec/png_codec.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index 4ba9584..71c41cf 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -27,7 +27,7 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc
index 146f1ea..b6bc1c6 100644
--- a/chrome/browser/chromeos/login/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/webui_login_display.cc
@@ -16,7 +16,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 8c2f062..11fcd7f 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -28,7 +28,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "views/widget/native_widget_gtk.h"
 #endif
 
diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc
index afd1665f..6b64dc5 100644
--- a/chrome/browser/chromeos/login/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/webui_screen_locker.cc
@@ -18,11 +18,11 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
-#include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc
index 0bdced9..3a6e1b2 100644
--- a/chrome/browser/chromeos/panels/panel_browsertest.cc
+++ b/chrome/browser/chromeos/panels/panel_browsertest.cc
@@ -15,7 +15,7 @@
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc
index 650c252..844af90 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/setting_level_bubble.cc
@@ -22,7 +22,7 @@
 #include "views/widget/root_view.h"
 
 #if !defined(USE_AURA)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #endif
 
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 8f8833b..8ad86e6 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -102,7 +102,7 @@
 #include "chrome/browser/chromeos/network_message_observer.h"
 #include "chrome/browser/chromeos/sms_observer.h"
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_message_listener.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h"
 #endif
 #endif
 
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc
index 4a922af..4ee5778 100644
--- a/chrome/browser/ui/browser_list.cc
+++ b/chrome/browser/ui/browser_list.cc
@@ -36,7 +36,7 @@
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 #endif
 
diff --git a/chrome/browser/ui/views/browser_bubble_gtk.cc b/chrome/browser/ui/views/browser_bubble_gtk.cc
index c28ae02..fa06326 100644
--- a/chrome/browser/ui/views/browser_bubble_gtk.cc
+++ b/chrome/browser/ui/views/browser_bubble_gtk.cc
@@ -12,7 +12,7 @@
 #include "views/widget/native_widget_gtk.h"
 
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #endif
 
diff --git a/chrome/browser/ui/views/bubble/bubble.cc b/chrome/browser/ui/views/bubble/bubble.cc
index 042364c..43b68aa 100644
--- a/chrome/browser/ui/views/bubble/bubble.cc
+++ b/chrome/browser/ui/views/bubble/bubble.cc
@@ -16,7 +16,7 @@
 #include "views/widget/widget.h"
 
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #endif
 
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
index 4c1b051..16bc057 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.cc
+++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -24,7 +24,7 @@
 #include "views/widget/widget.h"
 
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #endif
 
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index ba94b58..c749490 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -28,7 +28,7 @@
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 namespace {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 65423b5..2d2ec1d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -510,6 +510,12 @@
         'browser/chromeos/input_method/xkeyboard.h',
         'browser/chromeos/language_preferences.cc',
         'browser/chromeos/language_preferences.h',
+        'browser/chromeos/legacy_window_manager/initial_browser_window_observer.cc',
+        'browser/chromeos/legacy_window_manager/initial_browser_window_observer.h',
+        'browser/chromeos/legacy_window_manager/wm_ipc.cc',
+        'browser/chromeos/legacy_window_manager/wm_ipc.h',
+        'browser/chromeos/legacy_window_manager/wm_message_listener.cc',
+        'browser/chromeos/legacy_window_manager/wm_message_listener.h',
         'browser/chromeos/locale_change_guard.cc',
         'browser/chromeos/locale_change_guard.h',
         'browser/chromeos/login/auth_attempt_state.cc',
@@ -797,10 +803,6 @@
         'browser/chromeos/web_socket_proxy.h',
         'browser/chromeos/web_socket_proxy_controller.cc',
         'browser/chromeos/web_socket_proxy_controller.h',
-        'browser/chromeos/wm_ipc.cc',
-        'browser/chromeos/wm_ipc.h',
-        'browser/chromeos/wm_message_listener.cc',
-        'browser/chromeos/wm_message_listener.h',
         'browser/chromeos/xinput_hierarchy_changed_event_listener.cc',
         'browser/chromeos/xinput_hierarchy_changed_event_listener.h',
         'browser/command_updater.cc',
@@ -5042,6 +5044,8 @@
                 ['exclude', '^browser/notifications/balloon_collection_impl.cc'],
                 ['exclude', '^browser/notifications/balloon_collection_impl.h'],
                 ['exclude', '^browser/notifications/balloon_collection_views.cc'],
+                ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.cc'],
+                ['exclude', '^chromeos/legacy_window_manager/initial_browser_window_observer.h'],
               ],
             }],
             ['chromeos==1',{
@@ -5157,6 +5161,8 @@
           'sources/': [
             ['exclude', '^browser/chromeos/browser/chromeos/login/screen_locker.cc'],
             ['exclude', '^browser/chromeos/frame/'],
+            ['exclude', '^browser/chromeos/legacy_window_manager/wm_ipc.cc'],
+            ['exclude', '^browser/chromeos/legacy_window_manager/wm_message_listener.cc'],
             ['exclude', '^browser/chromeos/login/background_view.cc'],
             ['exclude', '^browser/chromeos/login/screen_locker_browsertest.cc'],
             ['exclude', '^browser/chromeos/login/screen_locker_views.cc'],
@@ -5170,8 +5176,6 @@
             ['exclude', '^browser/chromeos/login/webui_screen_locker.cc'],
             ['exclude', '^browser/chromeos/login/wizard_in_process_browser_test.cc'],
             ['exclude', '^browser/chromeos/notifications/'],
-            ['exclude', '^browser/chromeos/wm_ipc.cc'],
-            ['exclude', '^browser/chromeos/wm_message_listener.cc'],
             ['exclude', '^browser/chromeos/xinput_hierarchy_changed_event_listener.cc'],
             ['include', '^browser/ui/views/handle_web_keyboard_event_aura.cc'],
             ['include', '^browser/ui/views/handle_web_keyboard_event.h'],