aura: Try to make Linux host resize code more reliable.

ui/aura/desktop.cc

 // Copyright (c) 2011 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 "ui/aura/desktop.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 23 matching lines @@
 namespace {
 
 // Default bounds for the host window.
 static const int kDefaultHostWindowX = 200;
 static const int kDefaultHostWindowY = 200;
 static const int kDefaultHostWindowWidth = 1280;
 static const int kDefaultHostWindowHeight = 1024;
 
 }  // namespace
 
-// static
 Desktop* Desktop::instance_ = NULL;
-
-// static
 ui::Compositor*(*Desktop::compositor_factory_)() = NULL;
+bool Desktop::use_fullscreen_host_window_ = false;
 
 Desktop::Desktop()
     : Window(NULL),
       host_(aura::DesktopHost::Create(GetInitialHostWindowBounds())),
       ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
       active_window_(NULL),
       in_destructor_(false),
       screen_(new ScreenAura),
       capture_window_(NULL),
       mouse_pressed_handler_(NULL),
@@ skipping 345 matching lines @@
 Window* Desktop::GetFocusedWindow() {
   return focused_window_;
 }
 
 bool Desktop::IsFocusedWindow(const Window* window) const {
   return focused_window_ == window;
 }
 
 void Desktop::Init() {
   Window::Init();
-  SetBounds(gfx::Rect(gfx::Point(), host_->GetSize()));
+  SetBounds(gfx::Rect(host_->GetSize()));
   Show();
   compositor()->SetRootLayer(layer());
 }
 
 gfx::Rect Desktop::GetInitialHostWindowBounds() const {
+  gfx::Rect bounds(kDefaultHostWindowX, kDefaultHostWindowY,
+                   kDefaultHostWindowWidth, kDefaultHostWindowHeight);
+
   const string size_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kAuraHostWindowSize);
-
-  int width = 0, height = 0;
   vector<string> parts;
   base::SplitString(size_str, 'x', &parts);
-  if (parts.size() != 2 ||
-      !base::StringToInt(parts[0], &width) ||
-      !base::StringToInt(parts[1], &height) ||
-      width <= 0 || height <= 0) {
-    width = kDefaultHostWindowWidth;
-    height = kDefaultHostWindowHeight;
+  int parsed_width = 0, parsed_height = 0;
+  if (parts.size() == 2 &&
+      base::StringToInt(parts[0], &parsed_width) && parsed_width > 0 &&
+      base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
+    bounds.set_size(gfx::Size(parsed_width, parsed_height));
+  } else if (use_fullscreen_host_window_) {
+    bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize());
   }
-  return gfx::Rect(kDefaultHostWindowX, kDefaultHostWindowY, width, height);
+
+  return bounds;
 }
 
 }  // namespace aura