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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_desktop_aura.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "content/shell/browser/shell_browser_context.h" 6 #include "content/shell/browser/shell_browser_context.h"
7 #include "ui/aura/env.h"
8 #include "ui/gfx/screen.h" 7 #include "ui/gfx/screen.h"
9 #include "ui/views/widget/desktop_aura/desktop_screen.h" 8 #include "ui/views/widget/desktop_aura/desktop_screen.h"
10 #include "ui/views_content_client/views_content_client.h" 9 #include "ui/views_content_client/views_content_client.h"
11 #include "ui/views_content_client/views_content_client_main_parts_aura.h" 10 #include "ui/views_content_client/views_content_client_main_parts_aura.h"
12 11
13 namespace ui { 12 namespace ui {
14 13
15 namespace { 14 namespace {
16 15
17 class ViewsContentClientMainPartsDesktopAura 16 class ViewsContentClientMainPartsDesktopAura
(...skipping 13 matching lines...) Expand all
31 30
32 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura( 31 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura(
33 const content::MainFunctionParams& content_params, 32 const content::MainFunctionParams& content_params,
34 ViewsContentClient* views_content_client) 33 ViewsContentClient* views_content_client)
35 : ViewsContentClientMainPartsAura(content_params, views_content_client) { 34 : ViewsContentClientMainPartsAura(content_params, views_content_client) {
36 } 35 }
37 36
38 void ViewsContentClientMainPartsDesktopAura::PreMainMessageLoopRun() { 37 void ViewsContentClientMainPartsDesktopAura::PreMainMessageLoopRun() {
39 ViewsContentClientMainPartsAura::PreMainMessageLoopRun(); 38 ViewsContentClientMainPartsAura::PreMainMessageLoopRun();
40 39
41 aura::Env::CreateInstance(true);
42 gfx::Screen::SetScreenInstance(views::CreateDesktopScreen()); 40 gfx::Screen::SetScreenInstance(views::CreateDesktopScreen());
43 41
44 views_content_client()->task().Run(browser_context(), NULL); 42 views_content_client()->task().Run(browser_context(), NULL);
45 } 43 }
46 44
47 } // namespace 45 } // namespace
48 46
49 // static 47 // static
50 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( 48 ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
51 const content::MainFunctionParams& content_params, 49 const content::MainFunctionParams& content_params,
52 ViewsContentClient* views_content_client) { 50 ViewsContentClient* views_content_client) {
53 return new ViewsContentClientMainPartsDesktopAura( 51 return new ViewsContentClientMainPartsDesktopAura(
54 content_params, views_content_client); 52 content_params, views_content_client);
55 } 53 }
56 54
57 } // namespace ui 55 } // namespace ui
OLDNEW
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts_aura.cc ('k') | ui/wm/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698