Make sure the non browser/non app widget is fully visible when created on ash

chrome/browser/ui/views/chrome_views_delegate.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/views/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
@@ skipping 21 matching lines @@
 #endif
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
+#include "ash/wm/window_state.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #endif
 
 namespace {
 
 // If the given window has a profile associated with it, use that profile's
 // preference service. Otherwise, store and retrieve the data from Local State.
 // This function may return NULL if the necessary pref service has not yet
 // been initialized.
@@ skipping 33 matching lines @@
                                  show_state == ui::SHOW_STATE_MAXIMIZED);
   gfx::Rect work_area(gfx::Screen::GetScreenFor(window->GetNativeView())->
       GetDisplayNearestWindow(window->GetNativeView()).work_area());
   window_preferences->SetInteger("work_area_left", work_area.x());
   window_preferences->SetInteger("work_area_top", work_area.y());
   window_preferences->SetInteger("work_area_right", work_area.right());
   window_preferences->SetInteger("work_area_bottom", work_area.bottom());
 }
 
 bool ChromeViewsDelegate::GetSavedWindowPlacement(
+    const views::Widget* widget,
     const std::string& window_name,
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   PrefService* prefs = g_browser_process->local_state();
   if (!prefs)
     return false;
 
   DCHECK(prefs->FindPreference(window_name.c_str()));
   const DictionaryValue* dictionary = prefs->GetDictionary(window_name.c_str());
   int left, top, right, bottom;
   if (!dictionary || !dictionary->GetInteger("left", &left) ||
       !dictionary->GetInteger("top", &top) ||
       !dictionary->GetInteger("right", &right) ||
       !dictionary->GetInteger("bottom", &bottom))
     return false;
 
   bounds->SetRect(left, top, right - left, bottom - top);
 
   bool maximized = false;
   if (dictionary)
     dictionary->GetBoolean("maximized", &maximized);
   *show_state = maximized ? ui::SHOW_STATE_MAXIMIZED : ui::SHOW_STATE_NORMAL;
 
+#if defined(USE_ASH)
+  // On Ash environment, a window won't span across displays.  Adjust
+  // the bounds to fit the work area.
+  gfx::NativeView window = widget->GetNativeView();
+  if (chrome::GetHostDesktopTypeForNativeView(window) ==
+      chrome::HOST_DESKTOP_TYPE_ASH) {
+    gfx::Display display = gfx::Screen::GetScreenFor(window)->
+        GetDisplayMatching(*bounds);
+    bounds->AdjustToFit(display.work_area());
+    ash::wm::GetWindowState(window)->set_minimum_visibility(true);
+  }
+#endif
   return true;
 }
 
 void ChromeViewsDelegate::NotifyAccessibilityEvent(
     views::View* view, ui::AccessibilityTypes::Event event_type) {
   AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
       view, event_type);
 }
 
 void ChromeViewsDelegate::NotifyMenuItemFocused(const string16& menu_name,
@@ skipping 140 matching lines @@
   }
 #endif
 }
 
 #if !defined(OS_CHROMEOS)
 base::TimeDelta
 ChromeViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() {
   return base::TimeDelta();
 }
 #endif