Re-land r246921: "Allow running content-shell headless with --dump-render-tree."

This change reverts r247148 and re-lands r246921. It's unclear if there
really is something wrong with this patch, and the crashes in
run-webkit-tests were addressed in Blink r165816.

TBR=jochen@chromium.org, sadrul@chromium.org
BUG=316712

Review URL: https://codereview.chromium.org/132903012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247278 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 53 insertions, 0 deletions

diff --git a/content/shell/browser/shell_platform_data_aura.h b/content/shell/browser/shell_platform_data_aura.h
new file mode 100644
index 0000000..9b7ea2b
--- /dev/null
+++ b/content/shell/browser/shell_platform_data_aura.h
@@ -0,0 +1,53 @@
+// Copyright 2014 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.
+
+#ifndef CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
+#define CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_
+
+#include "base/memory/scoped_ptr.h"
+
+namespace aura {
+namespace client {
+class DefaultActivationClient;
+class DefaultCaptureClient;
+class FocusClient;
+class WindowTreeClient;
+}
+class RootWindow;
+}
+
+namespace gfx {
+class Size;
+}
+
+namespace ui {
+class EventHandler;
+}
+
+namespace content {
+
+class ShellPlatformDataAura {
+ public:
+  explicit ShellPlatformDataAura(const gfx::Size& initial_size);
+  ~ShellPlatformDataAura();
+
+  void ShowWindow();
+  void ResizeWindow(const gfx::Size& size);
+
+  aura::RootWindow* window() { return root_window_.get(); }
+
+ private:
+  scoped_ptr<aura::RootWindow> root_window_;
+  scoped_ptr<aura::client::FocusClient> focus_client_;
+  scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
+  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+  scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
+  scoped_ptr<ui::EventHandler> ime_filter_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShellPlatformDataAura);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_SHELL_BROWSER_SHELL_PLATFORM_DATA_AURA_H_