Create windows for new app window bounds API

chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

 // Copyright 2014 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/apps/chrome_native_app_window_views.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ skipping 206 matching lines @@
   // TODO(mgiuca): Remove this during fix for http://crbug.com/322256.
   init_params.remove_standard_frame = true;
 #endif
   init_params.use_system_default_icon = true;
   // TODO(erg): Conceptually, these are toplevel windows, but we theoretically
   // could plumb context through to here in some cases.
   init_params.top_level = true;
   if (create_params.transparent_background)
     init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   init_params.keep_on_top = create_params.always_on_top;
-  gfx::Rect window_bounds = create_params.bounds;
-  bool position_specified =
-      window_bounds.x() != INT_MIN && window_bounds.y() != INT_MIN;
-  if (position_specified && !window_bounds.IsEmpty())
-    init_params.bounds = window_bounds;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Set up a custom WM_CLASS for app windows. This allows task switchers in
   // X11 environments to distinguish them from main browser windows.
   init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name);
   init_params.wm_class_class = ShellIntegrationLinux::GetProgramClassName();
   const char kX11WindowRoleApp[] = "app";
   init_params.wm_role_name = std::string(kX11WindowRoleApp);
 #endif
 
   OnBeforeWidgetInit(&init_params, window());
   window()->Init(init_params);
 
-  gfx::Rect adjusted_bounds = window_bounds;
-  adjusted_bounds.Inset(-GetFrameInsets());
-  // Center window if no position was specified.
-  if (!position_specified)
-    window()->CenterWindow(adjusted_bounds.size());
-  else if (!adjusted_bounds.IsEmpty() && adjusted_bounds != window_bounds)
-    window()->SetBounds(adjusted_bounds);
+  // The frame insets are required to resolve the bounds specifications
+  // correctly. So we set the window bounds and constraints now.
+  gfx::Insets frame_insets = GetFrameInsets();
+  gfx::Rect window_bounds = create_params.GetInitialWindowBounds(frame_insets);
+  SetContentMinimumSize(create_params.GetContentMinimumSize(frame_insets));
+  SetContentMaximumSize(create_params.GetContentMaximumSize(frame_insets));
+  if (!window_bounds.IsEmpty()) {
+    typedef apps::AppWindow::BoundsSpecification BoundsSpecification;
+    bool position_specified =
+        window_bounds.x() != BoundsSpecification::kUnspecifiedPosition &&
+        window_bounds.y() != BoundsSpecification::kUnspecifiedPosition;
+    if (!position_specified)
+      window()->CenterWindow(window_bounds.size());
+    else
+      window()->SetBounds(window_bounds);
+  }
 
   // Register accelarators supported by app windows.
   // TODO(jeremya/stevenjb): should these be registered for panels too?
   views::FocusManager* focus_manager = GetFocusManager();
   const std::map<ui::Accelerator, int>& accelerator_table =
       GetAcceleratorTable();
   const bool is_kiosk_app_mode = chrome::IsRunningInForcedAppMode();
 
   // Ensures that kiosk mode accelerators are enabled when in kiosk mode (to be
   // future proof). This is needed because GetAcceleratorTable() uses a static
@@ skipping 14 matching lines @@
     focus_manager->RegisterAccelerator(
         iter->first, ui::AcceleratorManager::kNormalPriority, this);
   }
 }
 
 void ChromeNativeAppWindowViews::InitializePanelWindow(
     const AppWindow::CreateParams& create_params) {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_PANEL);
   params.delegate = this;
 
-  preferred_size_ = gfx::Size(create_params.bounds.width(),
-                              create_params.bounds.height());
+  gfx::Rect initial_window_bounds =
+      create_params.GetInitialWindowBounds(gfx::Insets());
+  preferred_size_ = gfx::Size(initial_window_bounds.width(),
+                              initial_window_bounds.height());
   if (preferred_size_.width() == 0)
     preferred_size_.set_width(kDefaultPanelWidth);
   else if (preferred_size_.width() < kMinPanelWidth)
     preferred_size_.set_width(kMinPanelWidth);
 
   if (preferred_size_.height() == 0)
     preferred_size_.set_height(kDefaultPanelHeight);
   else if (preferred_size_.height() < kMinPanelHeight)
     preferred_size_.set_height(kMinPanelHeight);
 #if defined(USE_ASH)
   if (ash::Shell::HasInstance()) {
     // Open a new panel on the target root.
     aura::Window* target = ash::Shell::GetTargetRootWindow();
     params.bounds = ash::ScreenUtil::ConvertRectToScreen(
         target, gfx::Rect(preferred_size_));
   } else {
     params.bounds = gfx::Rect(preferred_size_);
   }
 #else
   params.bounds = gfx::Rect(preferred_size_);
 #endif
   // TODO(erg): Conceptually, these are toplevel windows, but we theoretically
   // could plumb context through to here in some cases.
   params.top_level = true;
   window()->Init(params);
   window()->set_focus_on_creation(create_params.focused);
 
 #if defined(USE_ASH)
   if (create_params.state == ui::SHOW_STATE_DETACHED) {
-    gfx::Rect window_bounds(create_params.bounds.x(),
-                            create_params.bounds.y(),
+    gfx::Rect window_bounds(initial_window_bounds.x(),
+                            initial_window_bounds.y(),
                             preferred_size_.width(),
                             preferred_size_.height());
     aura::Window* native_window = GetNativeWindow();
     ash::wm::GetWindowState(native_window)->set_panel_attached(false);
     aura::client::ParentWindowWithContext(native_window,
                                           native_window->GetRootWindow(),
                                           native_window->GetBoundsInScreen());
     window()->SetBounds(window_bounds);
   }
 #else
@@ skipping 344 matching lines @@
       NULL));
 
 #if defined(OS_WIN)
   if (!ShouldUseNativeFrame() &&
       chrome::GetHostDesktopTypeForNativeWindow(window()->GetNativeWindow()) !=
       chrome::HOST_DESKTOP_TYPE_ASH) {
     InstallEasyResizeTargeterOnContainer();
   }
 #endif
 }