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

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

Issue 2300703005: DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways. (Closed)
Patch Set: for_landing! Created 4 years, 3 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
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_main_parts.h" 5 #include "headless/lib/browser/headless_browser_main_parts.h"
6 6
7 #include "components/devtools_http_handler/devtools_http_handler.h"
8 #include "headless/lib/browser/headless_browser_context_impl.h" 7 #include "headless/lib/browser/headless_browser_context_impl.h"
9 #include "headless/lib/browser/headless_browser_impl.h" 8 #include "headless/lib/browser/headless_browser_impl.h"
10 #include "headless/lib/browser/headless_devtools.h" 9 #include "headless/lib/browser/headless_devtools.h"
11 #include "headless/lib/browser/headless_screen.h" 10 #include "headless/lib/browser/headless_screen.h"
12 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
13 #include "ui/display/screen.h" 12 #include "ui/display/screen.h"
14 13
15 namespace headless { 14 namespace headless {
16 15
17 namespace { 16 namespace {
18 17
19 void PlatformInitialize(const gfx::Size& screen_size) { 18 void PlatformInitialize(const gfx::Size& screen_size) {
20 HeadlessScreen* screen = HeadlessScreen::Create(screen_size); 19 HeadlessScreen* screen = HeadlessScreen::Create(screen_size);
21 display::Screen::SetScreenInstance(screen); 20 display::Screen::SetScreenInstance(screen);
22 } 21 }
23 22
24 void PlatformExit() { 23 void PlatformExit() {
25 } 24 }
26 25
27 } // namespace 26 } // namespace
28 27
29 HeadlessBrowserMainParts::HeadlessBrowserMainParts(HeadlessBrowserImpl* browser) 28 HeadlessBrowserMainParts::HeadlessBrowserMainParts(HeadlessBrowserImpl* browser)
30 : browser_(browser) {} 29 : browser_(browser) {}
31 30
32 HeadlessBrowserMainParts::~HeadlessBrowserMainParts() {} 31 HeadlessBrowserMainParts::~HeadlessBrowserMainParts() {}
33 32
34 void HeadlessBrowserMainParts::PreMainMessageLoopRun() { 33 void HeadlessBrowserMainParts::PreMainMessageLoopRun() {
35 if (browser_->options()->devtools_endpoint.address().IsValid()) { 34 if (browser_->options()->devtools_endpoint.address().IsValid())
36 devtools_http_handler_ = 35 StartLocalDevToolsHttpHandler(browser_->options());
37 CreateLocalDevToolsHttpHandler(browser_->options());
38 }
39 PlatformInitialize(browser_->options()->window_size); 36 PlatformInitialize(browser_->options()->window_size);
40 } 37 }
41 38
42 void HeadlessBrowserMainParts::PostMainMessageLoopRun() { 39 void HeadlessBrowserMainParts::PostMainMessageLoopRun() {
43 devtools_http_handler_.reset(); 40 StopLocalDevToolsHttpHandler();
44
45 PlatformExit(); 41 PlatformExit();
46 } 42 }
47 43
48 } // namespace headless 44 } // namespace headless
OLDNEW
« no previous file with comments | « headless/lib/browser/headless_browser_main_parts.h ('k') | headless/lib/browser/headless_devtools.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698