Adding experimental maximize mode (behind a flag)

chrome/browser/extensions/api/app_window/app_window_api.cc

 // Copyright (c) 2012 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/extensions/api/app_window/app_window_api.h"
 
 #include "base/command_line.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#endif
+
 namespace app_window = extensions::api::app_window;
 namespace Create = app_window::Create;
 
 namespace extensions {
 
 namespace app_window_constants {
 const char kInvalidWindowId[] =
     "The window id can not be more than 256 characters long.";
 }
 
@@ skipping 57 matching lines @@
       url = absolute;
   }
 
   bool inject_html_titlebar = false;
 
   // TODO(jeremya): figure out a way to pass the opening WebContents through to
   // ShellWindow::Create so we can set the opener at create time rather than
   // with a hack in AppWindowCustomBindings::GetView().
   ShellWindow::CreateParams create_params;
   app_window::CreateWindowOptions* options = params->options.get();
+#if defined(USE_ASH)
+  bool force_maximize = ash::Shell::IsForcedMaximizeMode();

[James Cook, 2013/04/23 18:27:33]

I like this better - less strange ifdef-induced indentation.

[Mr4D (OOO till 08-26), 2013/04/23 22:24:00]

Right - but it is adding code which is only needed for USE_ASH and which cannot
be clearly identified as such. But - I agree that it looks better!

+#else
+  bool force_maximize = false;
+#endif
   if (options) {
     if (options->id.get()) {
       // TODO(mek): use URL if no id specified?
       // Limit length of id to 256 characters.
       if (options->id->length() > 256) {
         error_ = app_window_constants::kInvalidWindowId;
         return false;
       }
 
       create_params.window_key = *options->id;
@@ skipping 106 matching lines @@
         case extensions::api::app_window::STATE_FULLSCREEN:
           create_params.state = ShellWindow::CreateParams::STATE_FULLSCREEN;
           break;
         case extensions::api::app_window::STATE_MAXIMIZED:
           create_params.state = ShellWindow::CreateParams::STATE_MAXIMIZED;
           break;
         case extensions::api::app_window::STATE_MINIMIZED:
           create_params.state = ShellWindow::CreateParams::STATE_MINIMIZED;
           break;
       }
+    } else {
+      force_maximize = false;
     }
   }
 
+  if (force_maximize)
+    create_params.state = ShellWindow::CreateParams::STATE_MAXIMIZED;
+
   create_params.creator_process_id =
       render_view_host_->GetProcess()->GetID();
 
   ShellWindow* shell_window =
       ShellWindow::Create(profile(), GetExtension(), url, create_params);
 
   if (chrome::ShouldForceFullscreenApp())
     shell_window->Fullscreen();
 
   content::RenderViewHost* created_view =
@@ skipping 19 matching lines @@
   if (ShellWindowRegistry::Get(profile())->HadDevToolsAttached(created_view)) {
     new DevToolsRestorer(this, created_view);
     return true;
   }
 
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions