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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts.cc

Issue 284113011: Repurpose views+content example into a generic multiprocess views runtime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase for horrible copyright header change in revert CL 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/examples/content_client/examples_browser_main_parts.h" 5 #include "ui/views_content_client/views_content_client_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
14 #include "content/public/browser/context_factory.h" 14 #include "content/public/browser/context_factory.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "content/shell/browser/shell_browser_context.h" 16 #include "content/shell/browser/shell_browser_context.h"
17 #include "ui/aura/env.h" 17 #include "ui/aura/env.h"
18 #include "ui/base/ime/input_method_initializer.h" 18 #include "ui/base/ime/input_method_initializer.h"
19 #include "ui/gfx/screen.h" 19 #include "ui/gfx/screen.h"
20 #include "ui/views/examples/examples_window_with_content.h"
21 #include "ui/views/test/desktop_test_views_delegate.h" 20 #include "ui/views/test/desktop_test_views_delegate.h"
22 #include "ui/views/widget/native_widget_aura.h" 21 #include "ui/views/widget/native_widget_aura.h"
22 #include "ui/views_content_client/views_content_client.h"
23 #include "ui/wm/core/wm_state.h" 23 #include "ui/wm/core/wm_state.h"
24 #include "url/gurl.h"
25 24
26 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
27 #include "ui/aura/test/test_screen.h" 26 #include "ui/aura/test/test_screen.h"
28 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
29 #include "ui/aura/window_event_dispatcher.h" 28 #include "ui/aura/window_event_dispatcher.h"
30 #include "ui/wm/test/wm_test_helper.h" 29 #include "ui/wm/test/wm_test_helper.h"
31 #else // !defined(OS_CHROMEOS) 30 #else // !defined(OS_CHROMEOS)
32 #include "ui/views/widget/desktop_aura/desktop_screen.h" 31 #include "ui/views/widget/desktop_aura/desktop_screen.h"
33 #endif 32 #endif
34 33
35 namespace views { 34 namespace ui {
36 namespace examples {
37 35
38 ExamplesBrowserMainParts::ExamplesBrowserMainParts( 36 ViewsContentClientMainParts::ViewsContentClientMainParts(
39 const content::MainFunctionParams& parameters) { 37 const content::MainFunctionParams& content_params,
38 ViewsContentClient* views_content_client)
39 : views_content_client_(views_content_client) {
40 } 40 }
41 41
42 ExamplesBrowserMainParts::~ExamplesBrowserMainParts() { 42 ViewsContentClientMainParts::~ViewsContentClientMainParts() {
43 } 43 }
44 44
45 void ExamplesBrowserMainParts::ToolkitInitialized() { 45 void ViewsContentClientMainParts::ToolkitInitialized() {
46 wm_state_.reset(new wm::WMState); 46 wm_state_.reset(new ::wm::WMState);
47 } 47 }
48 48
49 void ExamplesBrowserMainParts::PreMainMessageLoopRun() { 49 void ViewsContentClientMainParts::PreMainMessageLoopRun() {
50 ui::InitializeInputMethodForTesting(); 50 ui::InitializeInputMethodForTesting();
51 browser_context_.reset(new content::ShellBrowserContext(false, NULL)); 51 browser_context_.reset(new content::ShellBrowserContext(false, NULL));
52 52
53 gfx::NativeView window_context = NULL; 53 gfx::NativeView window_context = NULL;
54 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
55 gfx::Screen::SetScreenInstance( 55 gfx::Screen::SetScreenInstance(
56 gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create()); 56 gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
57 // Set up basic pieces of views::corewm. 57 // Set up basic pieces of views::corewm.
58 wm_test_helper_.reset(new wm::WMTestHelper(gfx::Size(800, 600), 58 wm_test_helper_.reset(new ::wm::WMTestHelper(gfx::Size(800, 600),
59 content::GetContextFactory())); 59 content::GetContextFactory()));
60 // Ensure the X window gets mapped. 60 // Ensure the X window gets mapped.
61 wm_test_helper_->host()->Show(); 61 wm_test_helper_->host()->Show();
62 // Ensure Aura knows where to open new windows. 62 // Ensure Aura knows where to open new windows.
63 window_context = wm_test_helper_->host()->window(); 63 window_context = wm_test_helper_->host()->window();
64 #else 64 #else
65 aura::Env::CreateInstance(true); 65 aura::Env::CreateInstance(true);
66 gfx::Screen::SetScreenInstance( 66 gfx::Screen::SetScreenInstance(
67 gfx::SCREEN_TYPE_NATIVE, CreateDesktopScreen()); 67 gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
68 #endif 68 #endif
69 views_delegate_.reset(new DesktopTestViewsDelegate); 69 views_delegate_.reset(new views::DesktopTestViewsDelegate);
70 70
71 ShowExamplesWindowWithContent( 71 views_content_client_->task().Run(browser_context_.get(), window_context);
72 QUIT_ON_CLOSE, browser_context_.get(), window_context);
73 } 72 }
74 73
75 void ExamplesBrowserMainParts::PostMainMessageLoopRun() { 74 void ViewsContentClientMainParts::PostMainMessageLoopRun() {
76 browser_context_.reset(); 75 browser_context_.reset();
77 #if defined(OS_CHROMEOS) 76 #if defined(OS_CHROMEOS)
78 wm_test_helper_.reset(); 77 wm_test_helper_.reset();
79 #endif 78 #endif
80 views_delegate_.reset(); 79 views_delegate_.reset();
81 aura::Env::DeleteInstance(); 80 aura::Env::DeleteInstance();
82 } 81 }
83 82
84 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) { 83 bool ViewsContentClientMainParts::MainMessageLoopRun(int* result_code) {
85 base::RunLoop run_loop; 84 base::RunLoop run_loop;
86 run_loop.Run(); 85 run_loop.Run();
87 return true; 86 return true;
88 } 87 }
89 88
90 } // namespace examples 89 } // namespace ui
91 } // namespace views
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts.h ('k') | ui/views_content_client/views_content_main_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698