Do not restore corrupt cached app window bounds.

apps/shell_window_geometry_cache.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 "apps/shell_window_geometry_cache.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 129 matching lines @@
 
   // Not in the map means loading data for the extension didn't finish yet or
   // the cache was not constructed until after the extension was loaded.
   // Attempt to load from sync to address the latter case.
   if (extension_data_it == cache_.end()) {
     LoadGeometryFromStorage(extension_id);
     extension_data_it = cache_.find(extension_id);
     DCHECK(extension_data_it != cache_.end());
   }
 
-  ExtensionData::const_iterator window_data = extension_data_it->second.find(
+  ExtensionData::const_iterator window_data_it = extension_data_it->second.find(
       window_id);
 
-  if (window_data == extension_data_it->second.end())
+  if (window_data_it == extension_data_it->second.end())
+    return false;
+
+  const WindowData& window_data = window_data_it->second;
+
+  // Check for and do not return corrupt data.
+  if ((bounds && window_data.bounds.IsEmpty()) ||
+      (screen_bounds && window_data.screen_bounds.IsEmpty()) ||
+      (window_state && window_data.window_state == ui::SHOW_STATE_DEFAULT))
     return false;
 
   if (bounds)
-    *bounds = window_data->second.bounds;
+    *bounds = window_data.bounds;
   if (screen_bounds)
-    *screen_bounds = window_data->second.screen_bounds;
+    *screen_bounds = window_data.screen_bounds;
   if (window_state)
-    *window_state = window_data->second.window_state;
+    *window_state = window_data.window_state;
   return true;
 }
 
 void ShellWindowGeometryCache::Shutdown() {
   SyncToStorage();
 }
 
 
 ShellWindowGeometryCache::WindowData::WindowData()
   : window_state(ui::SHOW_STATE_DEFAULT) {
@@ skipping 127 matching lines @@
   return false;
 }
 
 content::BrowserContext*
 ShellWindowGeometryCache::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 } // namespace apps