Consolidate window showing into Window base class.

NativeWindow gets methods to update accessible state, title, Center and Show.

BUG=72040
TEST=none

Review URL: http://codereview.chromium.org/6647004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77421 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 93 insertions, 3 deletions

diff --git a/views/window/window.cc b/views/window/window.cc
index 5fbb222..24034cf 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -11,6 +11,8 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "views/widget/widget.h"
+#include "views/widget/native_widget.h"
+#include "views/window/native_window.h"
 #include "views/window/window_delegate.h"
 
 namespace views {
@@ -22,7 +24,9 @@ Window::Window(WindowDelegate* window_delegate)
     : native_window_(NULL),
       window_delegate_(window_delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(
-          non_client_view_(new NonClientView(this))) {
+          non_client_view_(new NonClientView(this))),
+      saved_maximized_state_(false),
+      minimum_size_(100, 100) {
   DCHECK(window_delegate_);
   DCHECK(!window_delegate_->window_);
   window_delegate_->window_ = this;
@@ -80,6 +84,12 @@ void Window::SetWindowBounds(const gfx::Rect& bounds,
 }
 
 void Window::Show() {
+  native_window_->Show(saved_maximized_state_ ? NativeWindow::SHOW_MAXIMIZED
+                                              : NativeWindow::SHOW_RESTORED);
+  // |saved_maximized_state_| only applies the first time the window is shown.
+  // If we don't reset the value the window will be shown maximized every time
+  // it is subsequently shown after being hidden.
+  saved_maximized_state_ = false;
 }
 
 void Window::HideWindow() {
@@ -144,6 +154,19 @@ void Window::EnableClose(bool enable) {
 }
 
 void Window::UpdateWindowTitle() {
+  // If the non-client view is rendering its own title, it'll need to relayout
+  // now.
+  non_client_view_->Layout();
+
+  // Update the native frame's text. We do this regardless of whether or not
+  // the native frame is being used, since this also updates the taskbar, etc.
+  std::wstring window_title;
+  if (native_window_->AsNativeWidget()->IsScreenReaderActive())
+    window_title = window_delegate_->GetAccessibleWindowTitle();
+  else
+    window_title = window_delegate_->GetWindowTitle();
+  base::i18n::AdjustStringForLocaleDirection(&window_title);
+  native_window_->SetWindowTitle(window_title);
 }
 
 void Window::UpdateWindowIcon() {
@@ -173,8 +196,26 @@ void Window::FrameTypeChanged() {
 ////////////////////////////////////////////////////////////////////////////////
 // Window, internal::NativeWindowDelegate implementation:
 
-gfx::Size Window::GetPreferredSize() const {
-  return non_client_view_->GetPreferredSize();
+bool Window::IsModal() const {
+  return window_delegate_->IsModal();
+}
+
+void Window::OnNativeWindowCreated(const gfx::Rect& bounds) {
+  if (window_delegate_->IsModal())
+    native_window_->BecomeModal();
+
+  // Create the ClientView, add it to the NonClientView and add the
+  // NonClientView to the RootView. This will cause everything to be parented.
+  non_client_view_->set_client_view(window_delegate_->CreateClientView(this));
+  // TODO(beng): make simpler once Window subclasses Widget.
+  native_window_->AsNativeWidget()->GetWidget()->SetContentsView(
+      non_client_view_);
+
+  UpdateWindowTitle();
+  native_window_->SetAccessibleRole(window_delegate_->accessible_role());
+  native_window_->SetAccessibleState(window_delegate_->accessible_state());
+
+  SetInitialBounds(bounds);
 }
 
 void Window::OnWindowDestroying() {
@@ -187,4 +228,53 @@ void Window::OnWindowDestroyed() {
   window_delegate_ = NULL;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Window, private:
+
+void Window::SetInitialBounds(const gfx::Rect& bounds) {
+  // First we obtain the window's saved show-style and store it. We need to do
+  // this here, rather than in Show() because by the time Show() is called,
+  // the window's size will have been reset (below) and the saved maximized
+  // state will have been lost. Sadly there's no way to tell on Windows when
+  // a window is restored from maximized state, so we can't more accurately
+  // track maximized state independently of sizing information.
+  window_delegate_->GetSavedMaximizedState(&saved_maximized_state_);
+
+  // Restore the window's placement from the controller.
+  gfx::Rect saved_bounds = bounds;
+  if (window_delegate_->GetSavedWindowBounds(&saved_bounds)) {
+    if (!window_delegate_->ShouldRestoreWindowSize()) {
+      saved_bounds.set_size(non_client_view_->GetPreferredSize());
+    } else {
+      // Make sure the bounds are at least the minimum size.
+      if (saved_bounds.width() < minimum_size_.width()) {
+        saved_bounds.SetRect(saved_bounds.x(), saved_bounds.y(),
+                             saved_bounds.right() + minimum_size_.width() -
+                                 saved_bounds.width(),
+                             saved_bounds.bottom());
+      }
+
+      if (saved_bounds.height() < minimum_size_.height()) {
+        saved_bounds.SetRect(saved_bounds.x(), saved_bounds.y(),
+                             saved_bounds.right(),
+                             saved_bounds.bottom() + minimum_size_.height() -
+                                 saved_bounds.height());
+      }
+    }
+
+    // Widget's SetBounds method does not further modify the bounds that are
+    // passed to it.
+    native_window_->AsNativeWidget()->SetBounds(saved_bounds);
+  } else {
+    if (bounds.IsEmpty()) {
+      // No initial bounds supplied, so size the window to its content and
+      // center over its parent.
+      native_window_->CenterWindow(non_client_view_->GetPreferredSize());
+    } else {
+      // Use the supplied initial bounds.
+      SetWindowBounds(bounds, NULL);
+    }
+  }
+}
+
 }  // namespace views