Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5262)

Unified Diff: chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc

Issue 186343002: Create windows for new app window bounds API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self nit: comment Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc
diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc
index ebba22de5c1a2bbae9db1df2723b17aadf5484e9..35592af8fdee2d856d4728d55f5fea2bd873a54d 100644
--- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc
+++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc
@@ -159,10 +159,10 @@ bool AppCurrentWindowInternalSetMinWidthFunction::RunWithWindow(
scoped_ptr<SetMinWidth::Params> params(SetMinWidth::Params::Create(*args_));
CHECK(params.get());
- gfx::Size min_size = window->GetBaseWindow()->GetMinimumSize();
+ gfx::Size min_size = window->GetBaseWindow()->GetContentMinimumSize();
min_size.set_width(params->min_width.get() ?
*(params->min_width) : kUnboundedSize);
- window->SetMinimumSize(min_size);
+ window->SetContentMinimumSize(min_size);
return true;
}
@@ -175,10 +175,10 @@ bool AppCurrentWindowInternalSetMinHeightFunction::RunWithWindow(
scoped_ptr<SetMinHeight::Params> params(SetMinHeight::Params::Create(*args_));
CHECK(params.get());
- gfx::Size min_size = window->GetBaseWindow()->GetMinimumSize();
+ gfx::Size min_size = window->GetBaseWindow()->GetContentMinimumSize();
min_size.set_height(params->min_height.get() ?
*(params->min_height) : kUnboundedSize);
- window->SetMinimumSize(min_size);
+ window->SetContentMinimumSize(min_size);
return true;
}
@@ -191,10 +191,10 @@ bool AppCurrentWindowInternalSetMaxWidthFunction::RunWithWindow(
scoped_ptr<SetMaxWidth::Params> params(SetMaxWidth::Params::Create(*args_));
CHECK(params.get());
- gfx::Size max_size = window->GetBaseWindow()->GetMaximumSize();
+ gfx::Size max_size = window->GetBaseWindow()->GetContentMaximumSize();
max_size.set_width(params->max_width.get() ?
*(params->max_width) : kUnboundedSize);
- window->SetMaximumSize(max_size);
+ window->SetContentMaximumSize(max_size);
return true;
}
@@ -207,10 +207,10 @@ bool AppCurrentWindowInternalSetMaxHeightFunction::RunWithWindow(
scoped_ptr<SetMaxHeight::Params> params(SetMaxHeight::Params::Create(*args_));
CHECK(params.get());
- gfx::Size max_size = window->GetBaseWindow()->GetMaximumSize();
+ gfx::Size max_size = window->GetBaseWindow()->GetContentMaximumSize();
max_size.set_height(params->max_height.get() ?
*(params->max_height) : kUnboundedSize);
- window->SetMaximumSize(max_size);
+ window->SetContentMaximumSize(max_size);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698