| Index: chrome/browser/extensions/api/app_window/app_window_api.cc
|
| diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
|
| index 1f726db950869721bfeacc309dadf83f108de687..883f2b30750bba6779153f42015defe586f9b362 100644
|
| --- a/chrome/browser/extensions/api/app_window/app_window_api.cc
|
| +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
|
| @@ -24,6 +24,12 @@
|
| #include "googleurl/src/gurl.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| +#if defined(USE_ASH)
|
| +#include "ash/wm/property_util.h"
|
| +#include "ui/aura/root_window.h"
|
| +#include "ui/aura/window.h"
|
| +#endif
|
| +
|
| namespace app_window = extensions::api::app_window;
|
| namespace Create = app_window::Create;
|
|
|
| @@ -101,6 +107,7 @@ bool AppWindowCreateFunction::RunImpl() {
|
| // with a hack in AppWindowCustomBindings::GetView().
|
| ShellWindow::CreateParams create_params;
|
| app_window::CreateWindowOptions* options = params->options.get();
|
| + bool force_maximize = true;
|
| if (options) {
|
| if (options->id.get()) {
|
| // TODO(mek): use URL if no id specified?
|
| @@ -227,6 +234,8 @@ bool AppWindowCreateFunction::RunImpl() {
|
| create_params.state = ShellWindow::CreateParams::STATE_MINIMIZED;
|
| break;
|
| }
|
| + } else {
|
| + force_maximize = false;
|
| }
|
| }
|
|
|
| @@ -236,6 +245,20 @@ bool AppWindowCreateFunction::RunImpl() {
|
| ShellWindow* shell_window =
|
| ShellWindow::Create(profile(), GetExtension(), url, create_params);
|
|
|
| +#if USE_ASH
|
| + if (force_maximize && !create_params.maximum_size.IsEmpty()) {
|
| + // Test if the application can be resized to the full extent of the given
|
| + // screen.
|
| + gfx::Size size =
|
| + shell_window->GetNativeWindow()->GetRootWindow()->bounds().size();
|
| + if (size.width() > create_params.maximum_size.width() ||
|
| + size.height() > create_params.maximum_size.height())
|
| + force_maximize = false;
|
| + }
|
| + if (force_maximize)
|
| + ash::SetCanBeMaximizedByWorkspace(shell_window->GetNativeWindow(), true);
|
| +#endif
|
| +
|
| if (chrome::ShouldForceFullscreenApp())
|
| shell_window->Fullscreen();
|
|
|
|
|