Make app windows restore position even if bounds are explicitly specified.

chrome/browser/ui/extensions/shell_window.cc

 // Copyright (c) 2012 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/ui/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/shell_window_geometry_cache.h"
@@ skipping 58 matching lines @@
       base::Bind(&ResourceDispatcherHost::BlockRequestsForRoute,
           base::Unretained(ResourceDispatcherHost::Get()),
           rvh->GetProcess()->GetID(), rvh->GetRoutingID()));
 }
 
 }  // namespace
 
 ShellWindow::CreateParams::CreateParams()
   : frame(ShellWindow::CreateParams::FRAME_CHROME),
     bounds(INT_MIN, INT_MIN, INT_MIN, INT_MIN),
-    restore_position(true), restore_size(true),
     creator_process_id(0), hidden(false) {
 }
 
 ShellWindow::CreateParams::~CreateParams() {
 }
 
 ShellWindow* ShellWindow::Create(Profile* profile,
                                  const extensions::Extension* extension,
                                  const GURL& url,
                                  const ShellWindow::CreateParams& params) {
@@ skipping 36 matching lines @@
     bounds.set_width(kDefaultWidth);
   if (bounds.height() == INT_MIN)
     bounds.set_height(kDefaultHeight);
 
   // If left and top are left undefined, the native shell window will center
   // the window on the main screen in a platform-defined manner.
 
   if (!params.window_key.empty()) {
     window_key_ = params.window_key;
 
-    if (params.restore_position || params.restore_size) {
-      extensions::ShellWindowGeometryCache* cache =
-          extensions::ExtensionSystem::Get(profile())->
-            shell_window_geometry_cache();
-      gfx::Rect cached_bounds;
-      if (cache->GetGeometry(extension()->id(), params.window_key,
-                             &cached_bounds)) {
-        if (params.restore_position)
-          bounds.set_origin(cached_bounds.origin());
-        if (params.restore_size)
-          bounds.set_size(cached_bounds.size());
-      }
-    }
+    extensions::ShellWindowGeometryCache* cache =
+        extensions::ExtensionSystem::Get(profile())->
+          shell_window_geometry_cache();
+    gfx::Rect cached_bounds;
+    if (cache->GetGeometry(extension()->id(), params.window_key,
+                           &cached_bounds))
+      bounds = cached_bounds;
   }
 
   ShellWindow::CreateParams new_params = params;
   new_params.bounds = bounds;
 
   native_window_.reset(NativeShellWindow::Create(this, new_params));
   SaveWindowPosition();
 
   if (!params.hidden)
     GetBaseWindow()->Show();
@@ skipping 355 matching lines @@
     const extensions::DraggableRegion& region = *iter;
     sk_region->op(
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }