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

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

Issue 1871253002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge Created 4 years, 8 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
« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" 7 #include "components/devtools_http_handler/devtools_http_handler.h"
8 #include "headless/lib/browser/headless_browser_context.h" 8 #include "headless/lib/browser/headless_browser_context.h"
9 #include "headless/lib/browser/headless_browser_impl.h" 9 #include "headless/lib/browser/headless_browser_impl.h"
10 #include "headless/lib/browser/headless_devtools.h" 10 #include "headless/lib/browser/headless_devtools.h"
11 #include "headless/lib/browser/headless_screen.h" 11 #include "headless/lib/browser/headless_screen.h"
12 #include "ui/aura/env.h" 12 #include "ui/aura/env.h"
13 #include "ui/gfx/screen.h" 13 #include "ui/gfx/screen.h"
14 14
15 namespace headless { 15 namespace headless {
16 16
17 namespace { 17 namespace {
18 18
19 void PlatformInitialize() { 19 void PlatformInitialize() {
20 HeadlessScreen* screen = HeadlessScreen::Create(gfx::Size()); 20 HeadlessScreen* screen = HeadlessScreen::Create(gfx::Size());
21 gfx::Screen::SetScreenInstance(screen); 21 gfx::Screen::SetScreenInstance(screen);
22 } 22 }
23 23
24 void PlatformExit() { 24 void PlatformExit() {
25 aura::Env::DeleteInstance();
26 } 25 }
27 26
28 } // namespace 27 } // namespace
29 28
30 HeadlessBrowserMainParts::HeadlessBrowserMainParts(HeadlessBrowserImpl* browser) 29 HeadlessBrowserMainParts::HeadlessBrowserMainParts(HeadlessBrowserImpl* browser)
31 : browser_(browser) {} 30 : browser_(browser) {}
32 31
33 HeadlessBrowserMainParts::~HeadlessBrowserMainParts() {} 32 HeadlessBrowserMainParts::~HeadlessBrowserMainParts() {}
34 33
35 void HeadlessBrowserMainParts::PreMainMessageLoopRun() { 34 void HeadlessBrowserMainParts::PreMainMessageLoopRun() {
36 browser_context_.reset(new HeadlessBrowserContext(browser_->options())); 35 browser_context_.reset(new HeadlessBrowserContext(browser_->options()));
37 if (browser_->options().devtools_endpoint.address().IsValid()) { 36 if (browser_->options().devtools_endpoint.address().IsValid()) {
38 devtools_http_handler_ = 37 devtools_http_handler_ =
39 CreateLocalDevToolsHttpHandler(browser_context_.get()); 38 CreateLocalDevToolsHttpHandler(browser_context_.get());
40 } 39 }
41 PlatformInitialize(); 40 PlatformInitialize();
42 } 41 }
43 42
44 void HeadlessBrowserMainParts::PostMainMessageLoopRun() { 43 void HeadlessBrowserMainParts::PostMainMessageLoopRun() {
45 browser_context_.reset(); 44 browser_context_.reset();
46 devtools_http_handler_.reset(); 45 devtools_http_handler_.reset();
47 PlatformExit(); 46 PlatformExit();
48 } 47 }
49 48
50 HeadlessBrowserContext* HeadlessBrowserMainParts::browser_context() const { 49 HeadlessBrowserContext* HeadlessBrowserMainParts::browser_context() const {
51 return browser_context_.get(); 50 return browser_context_.get();
52 } 51 }
53 52
54 } // namespace headless 53 } // namespace headless
OLDNEW
« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698