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

Side by Side Diff: headless/lib/browser/headless_browser_impl.cc

Issue 2567293004: Makes WindowTreeHost::InitHost() not Show the window (Closed)
Patch Set: WTF::Show shows window Created 4 years 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "headless/lib/browser/headless_browser_impl.h" 5 #include "headless/lib/browser/headless_browser_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "content/public/app/content_main.h" 14 #include "content/public/app/content_main.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "content/public/common/content_switches.h" 17 #include "content/public/common/content_switches.h"
18 #include "headless/lib/browser/headless_browser_context_impl.h" 18 #include "headless/lib/browser/headless_browser_context_impl.h"
19 #include "headless/lib/browser/headless_browser_main_parts.h" 19 #include "headless/lib/browser/headless_browser_main_parts.h"
20 #include "headless/lib/browser/headless_web_contents_impl.h" 20 #include "headless/lib/browser/headless_web_contents_impl.h"
21 #include "headless/lib/browser/headless_window_parenting_client.h" 21 #include "headless/lib/browser/headless_window_parenting_client.h"
22 #include "headless/lib/browser/headless_window_tree_host.h" 22 #include "headless/lib/browser/headless_window_tree_host.h"
23 #include "headless/lib/headless_content_main_delegate.h" 23 #include "headless/lib/headless_content_main_delegate.h"
24 #include "ui/aura/env.h" 24 #include "ui/aura/env.h"
25 #include "ui/aura/window.h"
25 #include "ui/events/devices/device_data_manager.h" 26 #include "ui/events/devices/device_data_manager.h"
26 #include "ui/gfx/geometry/size.h" 27 #include "ui/gfx/geometry/size.h"
27 28
28 namespace headless { 29 namespace headless {
29 namespace { 30 namespace {
30 31
31 int RunContentMain( 32 int RunContentMain(
32 HeadlessBrowser::Options options, 33 HeadlessBrowser::Options options,
33 const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) { 34 const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) {
34 content::ContentMainParams params(nullptr); 35 content::ContentMainParams params(nullptr);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 browser_main_parts_ = browser_main_parts; 119 browser_main_parts_ = browser_main_parts;
119 } 120 }
120 121
121 void HeadlessBrowserImpl::RunOnStartCallback() { 122 void HeadlessBrowserImpl::RunOnStartCallback() {
122 DCHECK(aura::Env::GetInstance()); 123 DCHECK(aura::Env::GetInstance());
123 ui::DeviceDataManager::CreateInstance(); 124 ui::DeviceDataManager::CreateInstance();
124 125
125 window_tree_host_.reset( 126 window_tree_host_.reset(
126 new HeadlessWindowTreeHost(gfx::Rect(options()->window_size))); 127 new HeadlessWindowTreeHost(gfx::Rect(options()->window_size)));
127 window_tree_host_->InitHost(); 128 window_tree_host_->InitHost();
129 window_tree_host_->window()->Show();
128 130
129 window_parenting_client_.reset( 131 window_parenting_client_.reset(
130 new HeadlessWindowParentingClient(window_tree_host_->window())); 132 new HeadlessWindowParentingClient(window_tree_host_->window()));
131 133
132 on_start_callback_.Run(this); 134 on_start_callback_.Run(this);
133 on_start_callback_ = base::Callback<void(HeadlessBrowser*)>(); 135 on_start_callback_ = base::Callback<void(HeadlessBrowser*)>();
134 } 136 }
135 137
136 HeadlessBrowserContext* HeadlessBrowserImpl::CreateBrowserContext( 138 HeadlessBrowserContext* HeadlessBrowserImpl::CreateBrowserContext(
137 HeadlessBrowserContext::Builder* builder) { 139 HeadlessBrowserContext::Builder* builder) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 210
209 // Child processes should not end up here. 211 // Child processes should not end up here.
210 base::CommandLine command_line(options.argc, options.argv); 212 base::CommandLine command_line(options.argc, options.argv);
211 DCHECK(!command_line.HasSwitch(switches::kProcessType)); 213 DCHECK(!command_line.HasSwitch(switches::kProcessType));
212 #endif 214 #endif
213 return RunContentMain(std::move(options), 215 return RunContentMain(std::move(options),
214 std::move(on_browser_start_callback)); 216 std::move(on_browser_start_callback));
215 } 217 }
216 218
217 } // namespace headless 219 } // namespace headless
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698