[WIN]Save work area of window and adjust bounds to ensure it fit on screen before show.

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/extensions/extension_prefs.h"
@@ skipping 32 matching lines @@
 // static
 ShellWindowGeometryCache* ShellWindowGeometryCache::Get(
     content::BrowserContext* context) {
   return Factory::GetForContext(context, true /* create */);
 }
 
 void ShellWindowGeometryCache::SaveGeometry(
     const std::string& extension_id,
     const std::string& window_id,
     const gfx::Rect& bounds,
+    const gfx::Rect& screen_bounds,
     ui::WindowShowState window_state) {
   ExtensionData& extension_data = cache_[extension_id];
 
   // If we don't have any unsynced changes and this is a duplicate of what's
   // already in the cache, just ignore it.
   if (extension_data[window_id].bounds == bounds &&
       extension_data[window_id].window_state == window_state &&
+      extension_data[window_id].screen_bounds == screen_bounds &&
       !ContainsKey(unsynced_extensions_, extension_id))
     return;
 
   base::Time now = base::Time::Now();
 
   extension_data[window_id].bounds = bounds;
+  extension_data[window_id].screen_bounds = screen_bounds;
   extension_data[window_id].window_state = window_state;
   extension_data[window_id].last_change = now;
 
   if (extension_data.size() > kMaxCachedWindows) {
     ExtensionData::iterator oldest = extension_data.end();
     // Too many windows in the cache, find the oldest one to remove.
     for (ExtensionData::iterator it = extension_data.begin();
          it != extension_data.end(); ++it) {
       // Don't expunge the window that was just added.
       if (it->first == window_id) continue;
@@ skipping 24 matching lines @@
   for (std::set<std::string>::const_iterator it = tosync.begin(),
       eit = tosync.end(); it != eit; ++it) {
     const std::string& extension_id = *it;
     const ExtensionData& extension_data = cache_[extension_id];
 
     scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
     for (ExtensionData::const_iterator it = extension_data.begin(),
          eit = extension_data.end(); it != eit; ++it) {
       base::DictionaryValue* value = new base::DictionaryValue;
       const gfx::Rect& bounds = it->second.bounds;
+      const gfx::Rect& screen_bounds = it->second.screen_bounds;
       value->SetInteger("x", bounds.x());
       value->SetInteger("y", bounds.y());
       value->SetInteger("w", bounds.width());
       value->SetInteger("h", bounds.height());
+      value->SetInteger("screen_bounds_x", screen_bounds.x());
+      value->SetInteger("screen_bounds_y", screen_bounds.y());
+      value->SetInteger("screen_bounds_w", screen_bounds.width());
+      value->SetInteger("screen_bounds_h", screen_bounds.height());
       value->SetInteger("state", it->second.window_state);
       value->SetString(
           "ts", base::Int64ToString(it->second.last_change.ToInternalValue()));
       dict->SetWithoutPathExpansion(it->first, value);
     }
     prefs_->SetGeometryCache(extension_id, dict.Pass());
   }
 }
 
 bool ShellWindowGeometryCache::GetGeometry(
     const std::string& extension_id,
     const std::string& window_id,
     gfx::Rect* bounds,
+    gfx::Rect* screen_bounds,
     ui::WindowShowState* window_state) {
 
   std::map<std::string, ExtensionData>::const_iterator
       extension_data_it = cache_.find(extension_id);
 
   // 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(
       window_id);
 
   if (window_data == extension_data_it->second.end())
     return false;
 
   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() {
   SyncToStorage();
 }
 
 void ShellWindowGeometryCache::Observe(
@@ skipping 46 matching lines @@
 
         int i;
         if (stored_window->GetInteger("x", &i))
           window_data.bounds.set_x(i);
         if (stored_window->GetInteger("y", &i))
           window_data.bounds.set_y(i);
         if (stored_window->GetInteger("w", &i))
           window_data.bounds.set_width(i);
         if (stored_window->GetInteger("h", &i))
           window_data.bounds.set_height(i);
+        if (stored_window->GetInteger("screen_bounds_x", &i))
+          window_data.screen_bounds.set_x(i);
+        if (stored_window->GetInteger("screen_bounds_y", &i))
+          window_data.screen_bounds.set_y(i);
+        if (stored_window->GetInteger("screen_bounds_w", &i))
+          window_data.screen_bounds.set_width(i);
+        if (stored_window->GetInteger("screen_bounds_h", &i))
+          window_data.screen_bounds.set_height(i);
         if (stored_window->GetInteger("state", &i)) {
           window_data.window_state =
               static_cast<ui::WindowShowState>(i);
         }
         std::string ts_as_string;
         if (stored_window->GetString("ts", &ts_as_string)) {
           int64 ts;
           if (base::StringToInt64(ts_as_string, &ts)) {
             window_data.last_change = base::Time::FromInternalValue(ts);
           }
@@ skipping 47 matching lines @@
   return false;
 }
 
 content::BrowserContext*
 ShellWindowGeometryCache::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 } // namespace apps