aura: Touch state file after first browser is ready.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // 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/chrome_browser_main_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "net/base/network_change_notifier.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #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(
       const base::NativeEvent& event) OVERRIDE {
     return base::EVENT_CONTINUE;
   }
 
   virtual void DidProcessEvent(
       const base::NativeEvent& event) OVERRIDE {
   }
@@ skipping 128 matching lines @@
   // per signals sent from the session manager.
   session_manager_observer_.reset(new chromeos::SessionManagerObserver);
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       AddObserver(session_manager_observer_.get());
 
   // Initialize the network change notifier for Chrome OS. The network
   // change notifier starts to monitor changes from the power manager and
   // 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
   }
 }