Moves TransientWindowClient to ui/aura/client and adds observer

content/shell/browser/shell.h

 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_H_
 #define CONTENT_SHELL_BROWSER_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
@@ skipping 18 matching lines @@
 }
 
 namespace wm {
 class WMTestHelper;
 }
 #endif  // defined(OS_CHROMEOS)
 namespace views {
 class Widget;
 class ViewsDelegate;
 }
+namespace wm {
+class WMState;
+}
 #endif  // defined(USE_AURA)
 
 class GURL;
 namespace content {
 
 #if defined(USE_AURA)
 class ShellPlatformDataAura;
 #endif
 
 class BrowserContext;
@@ skipping 197 matching lines @@
 #endif
 
   gfx::Size content_size_;
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 #elif defined(USE_AURA)
 #if defined(OS_CHROMEOS)
   static wm::WMTestHelper* wm_test_helper_;
   static display::Screen* test_screen_;
+#else
+  static wm::WMState* wm_state_;
 #endif
 #if defined(TOOLKIT_VIEWS)
   static views::ViewsDelegate* views_delegate_;
 
   views::Widget* window_widget_;
 #endif // defined(TOOLKIT_VIEWS)
   static ShellPlatformDataAura* platform_;
 #endif  // defined(USE_AURA)
 
   bool headless_;
 
   // A container of all the open windows. We use a vector so we can keep track
   // of ordering.
   static std::vector<Shell*> windows_;
 
   static base::Callback<void(Shell*)> shell_created_callback_;
 
   // True if the destructur of Shell should post a quit closure on the current
   // message loop if the destructed Shell object was the last one.
   static bool quit_message_loop_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_H_