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

Unified Diff: ui/views_content_client/views_content_client_main_parts_aura.cc

Issue 303543004: MacViews: views_examples_with_content_exe working! Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add files Created 6 years, 7 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: ui/views_content_client/views_content_client_main_parts_aura.cc
diff --git a/ui/views_content_client/views_content_client_main_parts_aura.cc b/ui/views_content_client/views_content_client_main_parts_aura.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ae46df0efda60c60c37d17a15c638613250a4b20
--- /dev/null
+++ b/ui/views_content_client/views_content_client_main_parts_aura.cc
@@ -0,0 +1,54 @@
+// 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 "ui/views_content_client/views_content_client_main_parts.h"
+
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
+#include "content/public/browser/context_factory.h"
+#include "content/public/common/content_switches.h"
+#include "content/shell/browser/shell_browser_context.h"
+#include "ui/aura/env.h"
+#include "ui/base/ime/input_method_initializer.h"
+#include "ui/gfx/screen.h"
+#include "ui/views/widget/native_widget_aura.h"
+#include "ui/views_content_client/views_content_client.h"
+#include "ui/wm/core/wm_state.h"
+
+#if defined(OS_CHROMEOS)
+#include "ui/aura/test/test_screen.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
+#include "ui/wm/test/wm_test_helper.h"
+#else // !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_aura/desktop_screen.h"
+#endif
+
+namespace ui {
+
+ViewsContentClientMainPartsAura::ViewsContentClientMainPartsAura(
+ const content::MainFunctionParams& content_params,
+ ViewsContentClient* views_content_client)
+ : ViewsContentClientMainParts(content_params, views_content_client) {
+}
+
+ViewsContentClientMainPartsAura::~ViewsContentClientMainPartsAura() {
+}
+
+void ViewsContentClientMainPartsAura::ToolkitInitialized() {
+ ViewsContentClientMainParts::ToolkitInitialized();
+ wm_state_.reset(new ::wm::WMState);
+}
+
+void ViewsContentClientMainPartsAura::PostMainMessageLoopRun() {
+ aura::Env::DeleteInstance();
+ ViewsContentClientMainParts::PostMainMessageLoopRun();
+}
+
+} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698