Move apps::SizeConstraints to extensions

Move apps/size_constraints.{cc,h} to extensions/browser
Change the namespace from apps to extensions

BUG=403726

Review URL: https://codereview.chromium.org/484613002

Cr-Commit-Position: refs/heads/master@{#290505}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290505 0039d316-1c4b-4281-b951-d872f2087c98

apps/app_window.cc

@@ -12,7 +12,6 @@
 #include "apps/app_web_contents_helper.h"
 #include "apps/app_window_geometry_cache.h"
 #include "apps/app_window_registry.h"
-#include "apps/size_constraints.h"
 #include "apps/ui/apps_client.h"
 #include "apps/ui/native_app_window.h"
 #include "apps/ui/web_contents_sizer.h"
@@ -36,6 +35,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
+#include "extensions/browser/app_window/size_constraints.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
@@ -74,7 +74,7 @@ const int kDefaultHeight = 384;
 void SetConstraintProperty(const std::string& name,
                            int value,
                            base::DictionaryValue* bounds_properties) {
-  if (value != SizeConstraints::kUnboundedSize)
+  if (value != extensions::SizeConstraints::kUnboundedSize)
     bounds_properties->SetInteger(name, value);
   else
     bounds_properties->Set(name, base::Value::CreateNullValue());
@@ -189,7 +189,7 @@ gfx::Rect AppWindow::CreateParams::GetInitialWindowBounds(
   }
 
   // Constrain the bounds.
-  SizeConstraints constraints(
+  extensions::SizeConstraints constraints(
       GetCombinedWindowConstraints(
           window_spec.minimum_size, content_spec.minimum_size, frame_insets),
       GetCombinedWindowConstraints(
@@ -649,7 +649,7 @@ void AppWindow::ForcedFullscreen() {
 
 void AppWindow::SetContentSizeConstraints(const gfx::Size& min_size,
                                           const gfx::Size& max_size) {
-  SizeConstraints constraints(min_size, max_size);
+  extensions::SizeConstraints constraints(min_size, max_size);
   native_app_window_->SetContentSizeConstraints(constraints.GetMinimumSize(),
                                                 constraints.GetMaximumSize());
 
@@ -758,10 +758,10 @@ void AppWindow::GetSerializedState(base::DictionaryValue* properties) const {
 
   gfx::Insets frame_insets = native_app_window_->GetFrameInsets();
   gfx::Rect frame_bounds = native_app_window_->GetBounds();
-  gfx::Size frame_min_size =
-      SizeConstraints::AddFrameToConstraints(content_min_size, frame_insets);
-  gfx::Size frame_max_size =
-      SizeConstraints::AddFrameToConstraints(content_max_size, frame_insets);
+  gfx::Size frame_min_size = extensions::SizeConstraints::AddFrameToConstraints(
+      content_min_size, frame_insets);
+  gfx::Size frame_max_size = extensions::SizeConstraints::AddFrameToConstraints(
+      content_max_size, frame_insets);
   SetBoundsProperties(frame_bounds,
                       frame_min_size,
                       frame_max_size,
@@ -1072,8 +1072,9 @@ AppWindow::CreateParams AppWindow::LoadDefaults(CreateParams params)
       gfx::Screen* screen = gfx::Screen::GetNativeScreen();
       gfx::Display display = screen->GetDisplayMatching(cached_bounds);
       gfx::Rect current_screen_bounds = display.work_area();
-      SizeConstraints constraints(params.GetWindowMinimumSize(gfx::Insets()),
-                                  params.GetWindowMaximumSize(gfx::Insets()));
+      extensions::SizeConstraints constraints(
+          params.GetWindowMinimumSize(gfx::Insets()),
+          params.GetWindowMaximumSize(gfx::Insets()));
       AdjustBoundsToBeVisibleOnScreen(cached_bounds,
                                       cached_screen_bounds,
                                       current_screen_bounds,

apps/apps.gypi

@@ -61,8 +61,6 @@
         'saved_files_service.h',
         'saved_files_service_factory.cc',
         'saved_files_service_factory.h',
-        'size_constraints.cc',
-        'size_constraints.h',
         'switches.cc',
         'switches.h',
         'ui/apps_client.cc',

apps/ui/views/native_app_window_views.h

@@ -5,10 +5,10 @@
 #ifndef APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
 #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
 
-#include "apps/size_constraints.h"
 #include "apps/ui/native_app_window.h"
 #include "base/observer_list.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "extensions/browser/app_window/size_constraints.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/widget/widget.h"
@@ -182,7 +182,7 @@ class NativeAppWindowViews : public NativeAppWindow,
 
   bool frameless_;
   bool resizable_;
-  apps::SizeConstraints size_constraints_;
+  extensions::SizeConstraints size_constraints_;
 
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 

chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

@@ -6,13 +6,13 @@
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
-#include "apps/size_constraints.h"
 #include "apps/ui/native_app_window.h"
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_current_window_internal.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/features/feature_channel.h"
+#include "extensions/browser/app_window/size_constraints.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
@@ -54,7 +54,7 @@ const char kAlwaysOnTopPermission[] =
 
 const char kInvalidParameters[] = "Invalid parameters.";
 
-const int kUnboundedSize = apps::SizeConstraints::kUnboundedSize;
+const int kUnboundedSize = SizeConstraints::kUnboundedSize;
 
 void GetBoundsFields(const Bounds& bounds_spec, gfx::Rect* bounds) {
   if (bounds_spec.left)
@@ -240,10 +240,10 @@ bool AppCurrentWindowInternalSetBoundsFunction::RunWithWindow(
 
   if (original_window_bounds != window_bounds) {
     if (original_window_bounds.size() != window_bounds.size()) {
-      apps::SizeConstraints constraints(
-          apps::SizeConstraints::AddFrameToConstraints(
+      SizeConstraints constraints(
+          SizeConstraints::AddFrameToConstraints(
               window->GetBaseWindow()->GetContentMinimumSize(), frame_insets),
-          apps::SizeConstraints::AddFrameToConstraints(
+          SizeConstraints::AddFrameToConstraints(
               window->GetBaseWindow()->GetContentMaximumSize(), frame_insets));
 
       window_bounds.set_size(constraints.ClampSize(window_bounds.size()));
@@ -275,7 +275,8 @@ bool AppCurrentWindowInternalSetSizeConstraintsFunction::RunWithWindow(
       window->GetBaseWindow()->GetContentMaximumSize();
   gfx::Size min_size = original_min_size;
   gfx::Size max_size = original_max_size;
-  const SizeConstraints& constraints = params->constraints;
+  const api::app_current_window_internal::SizeConstraints& constraints =
+      params->constraints;
 
   // Use the frame insets to convert window size constraints to content size
   // constraints.

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h

@@ -8,12 +8,12 @@
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#include "apps/size_constraints.h"
 #include "apps/ui/native_app_window.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "extensions/browser/app_window/size_constraints.h"
 #include "extensions/common/draggable_region.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/rect.h"
@@ -203,7 +203,7 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
   bool shows_resize_controls_;
   bool shows_fullscreen_controls_;
 
-  apps::SizeConstraints size_constraints_;
+  extensions::SizeConstraints size_constraints_;
 
   bool has_frame_color_;
   SkColor active_frame_color_;

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

@@ -939,7 +939,7 @@ - (void)setMouseDownCanMoveWindow:(BOOL)can_move;
                                          minimum_size.height())];
 
   gfx::Size maximum_size = size_constraints_.GetMaximumSize();
-  const int kUnboundedSize = apps::SizeConstraints::kUnboundedSize;
+  const int kUnboundedSize = extensions::SizeConstraints::kUnboundedSize;
   CGFloat max_width = maximum_size.width() == kUnboundedSize ?
       CGFLOAT_MAX : maximum_size.width();
   CGFloat max_height = maximum_size.height() == kUnboundedSize ?

extensions/browser/BUILD.gn

@@ -125,6 +125,8 @@ source_set("browser") {
       "api/usb/usb_device_resource.h",
       "api_activity_monitor.h",
       "app_sorting.h",
+      "app_window/size_constraints.cc",
+      "app_window/size_constraints.h",
       "blacklist_state.h",
       "blob_holder.cc",
       "blob_holder.h",

apps/size_constraints.cc → extensions/browser/app_window/size_constraints.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "apps/size_constraints.h"
+#include "extensions/browser/app_window/size_constraints.h"
 
 #include <algorithm>
 
 #include "ui/gfx/insets.h"
 
-namespace apps {
+namespace extensions {
 
 SizeConstraints::SizeConstraints()
     : maximum_size_(kUnboundedSize, kUnboundedSize) {}
@@ -80,4 +80,4 @@ void SizeConstraints::set_maximum_size(const gfx::Size& max_size) {
   maximum_size_ = max_size;
 }
 
-}  // namespace apps
+}  // namespace extensions

apps/size_constraints.h → extensions/browser/app_window/size_constraints.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APPS_SIZE_CONSTRAINTS_H_
-#define APPS_SIZE_CONSTRAINTS_H_
+#ifndef EXTENSIONS_BROWSER_APP_WINDOW_SIZE_CONSTRAINTS_H_
+#define EXTENSIONS_BROWSER_APP_WINDOW_SIZE_CONSTRAINTS_H_
 
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class Insets;
 }
 
-namespace apps {
+namespace extensions {
 
 class SizeConstraints {
  public:
@@ -52,6 +52,6 @@ class SizeConstraints {
   gfx::Size maximum_size_;
 };
 
-}  // namespace apps
+}  // namespace extensions
 
-#endif  // APPS_SIZE_CONSTRAINTS_H_
+#endif  // EXTENSIONS_BROWSER_APP_WINDOW_SIZE_CONSTRAINTS_H_

extensions/extensions.gyp

@@ -375,6 +375,8 @@
         'browser/api/usb_private/usb_private_api.h',
         'browser/api_activity_monitor.h',
         'browser/app_sorting.h',
+        'browser/app_window/size_constraints.cc',
+        'browser/app_window/size_constraints.h',
         'browser/blacklist_state.h',
         'browser/blob_holder.cc',
         'browser/blob_holder.h',