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 135 matching lines @@
     extension_data_it = cache_.find(extension_id);
     DCHECK(extension_data_it != cache_.end());
   }
 
   ExtensionData::const_iterator window_data = extension_data_it->second.find(
       window_id);
 
   if (window_data == extension_data_it->second.end())
     return false;
 
+  // Check for and do not return corrupt data.
+  if ((bounds && window_data->second.bounds.IsEmpty()) ||
+      (screen_bounds && window_data->second.screen_bounds.IsEmpty()) ||
+      (window_state &&
+          window_data->second.window_state == ui::SHOW_STATE_DEFAULT))
+    return false;
+

[Ken Rockot(use gerrit already), 2013/08/01 01:04:49]

nit: It might be nicer to use a named WindowData& ref to window_data->second in
these N lines of code that use it.

   if (bounds)
     *bounds = window_data->second.bounds;
   if (screen_bounds)
     *screen_bounds = window_data->second.screen_bounds;
   if (window_state)
     *window_state = window_data->second.window_state;
   return true;
 }
 
 void ShellWindowGeometryCache::Shutdown() {
@@ skipping 133 matching lines @@
   return false;
 }
 
 content::BrowserContext*
 ShellWindowGeometryCache::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 } // namespace apps