Add window property for restore bounds when virtual keyboard is enabled.

ash/wm/window_util_unittest.cc

 // Copyright (c) 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.
 
 #include "ash/wm/window_util.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_window.h"
+#include "ash/common/wm_window_property.h"
 #include "ash/screen_util.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state_aura.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 namespace {
 
 std::string GetAdjustedBounds(const gfx::Rect& visible,
                               gfx::Rect to_be_adjusted) {
   wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted);
   return to_be_adjusted.ToString();
@@ skipping 62 matching lines @@
   EXPECT_EQ(
       "-250,-40 100x100",
       GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150)));
   EXPECT_EQ(
       "-275,-50 100x100",
       GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150)));
   EXPECT_EQ("-125,0 100x100",
             GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150)));
 }
 
+// Test that WmWindow can get a Rect property set by aura::Window
+TEST_F(WindowUtilTest, RectPropertyTest) {
+  std::unique_ptr<aura::Window> window(
+      CreateTestWindowInShellWithBounds(gfx::Rect()));
+
+  gfx::Rect* prop_rect = new gfx::Rect(0, 0, 100, 100);
+  window->SetProperty(aura::client::kVKNewBoundsKey, prop_rect);
+
+  WmWindow* wm_window = WmWindowAura::Get(window.get());
+  EXPECT_EQ(wm_window->GetRectProperty(WmWindowProperty::VK_NEW_BOUNDS),
+            prop_rect);
+
+  window->ClearProperty(aura::client::kVKNewBoundsKey);
+  EXPECT_EQ(wm_window->GetRectProperty(WmWindowProperty::VK_NEW_BOUNDS),
+            nullptr);
+}
+
 }  // namespace ash