aura: Touch state file after first browser is ready.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 4843b50d7b3dbc943f60fc7e463f3e783f815e65..157d5bffa57b86d7fc8d35341f1312f98a14fd6a 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -32,6 +32,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(
@@ -180,10 +184,15 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
   // the network manager.
   chromeos::CrosNetworkChangeNotifierFactory::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
   }
 }