Index: extensions/browser/api/app_current_window_internal/app_current_window_internal_api.cc |
diff --git a/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.cc b/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.cc |
index 29cf618a1f77fc114cc4145e36674b4a86fe1ef6..67d0227d0b427484b7327d3170ea57b3a10b2047 100644 |
--- a/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.cc |
+++ b/extensions/browser/api/app_current_window_internal/app_current_window_internal_api.cc |
@@ -5,11 +5,11 @@ |
#include "extensions/browser/api/app_current_window_internal/app_current_window_internal_api.h" |
#include "base/command_line.h" |
+#include "components/native_app_window/native_app_window.h" |
+#include "components/native_app_window/size_constraints.h" |
#include "extensions/browser/app_window/app_window.h" |
#include "extensions/browser/app_window/app_window_client.h" |
#include "extensions/browser/app_window/app_window_registry.h" |
-#include "extensions/browser/app_window/native_app_window.h" |
-#include "extensions/browser/app_window/size_constraints.h" |
#include "extensions/common/api/app_current_window_internal.h" |
#include "extensions/common/features/simple_feature.h" |
#include "extensions/common/permissions/permissions_data.h" |
@@ -32,7 +32,6 @@ namespace SetVisibleOnAllWorkspaces = |
using app_current_window_internal::Bounds; |
using app_current_window_internal::Region; |
using app_current_window_internal::RegionRect; |
-using app_current_window_internal::SizeConstraints; |
namespace extensions { |
@@ -53,7 +52,7 @@ const char kAlwaysOnTopPermission[] = |
const char kInvalidParameters[] = "Invalid parameters."; |
-const int kUnboundedSize = SizeConstraints::kUnboundedSize; |
+const int kUnboundedSize = native_app_window::SizeConstraints::kUnboundedSize; |
void GetBoundsFields(const Bounds& bounds_spec, gfx::Rect* bounds) { |
if (bounds_spec.left) |
@@ -238,10 +237,10 @@ bool AppCurrentWindowInternalSetBoundsFunction::RunWithWindow( |
if (original_window_bounds != window_bounds) { |
if (original_window_bounds.size() != window_bounds.size()) { |
- SizeConstraints constraints( |
- SizeConstraints::AddFrameToConstraints( |
+ native_app_window::SizeConstraints constraints( |
+ native_app_window::SizeConstraints::AddFrameToConstraints( |
window->GetBaseWindow()->GetContentMinimumSize(), frame_insets), |
- SizeConstraints::AddFrameToConstraints( |
+ native_app_window::SizeConstraints::AddFrameToConstraints( |
window->GetBaseWindow()->GetContentMaximumSize(), frame_insets)); |
window_bounds.set_size(constraints.ClampSize(window_bounds.size())); |