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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_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 "ui/views_content_client/views_content_client_main_parts_aura.h" 5 #include "ui/views_content_client/views_content_client_main_parts_aura.h"
6 6
7 #include "ui/aura/env.h"
8 #include "ui/wm/core/wm_state.h" 7 #include "ui/wm/core/wm_state.h"
9 8
10 namespace ui { 9 namespace ui {
11 10
12 ViewsContentClientMainPartsAura::ViewsContentClientMainPartsAura( 11 ViewsContentClientMainPartsAura::ViewsContentClientMainPartsAura(
13 const content::MainFunctionParams& content_params, 12 const content::MainFunctionParams& content_params,
14 ViewsContentClient* views_content_client) 13 ViewsContentClient* views_content_client)
15 : ViewsContentClientMainParts(content_params, views_content_client) { 14 : ViewsContentClientMainParts(content_params, views_content_client) {
16 } 15 }
17 16
18 ViewsContentClientMainPartsAura::~ViewsContentClientMainPartsAura() { 17 ViewsContentClientMainPartsAura::~ViewsContentClientMainPartsAura() {
19 } 18 }
20 19
21 void ViewsContentClientMainPartsAura::ToolkitInitialized() { 20 void ViewsContentClientMainPartsAura::ToolkitInitialized() {
22 ViewsContentClientMainParts::ToolkitInitialized(); 21 ViewsContentClientMainParts::ToolkitInitialized();
23 22
24 wm_state_.reset(new ::wm::WMState); 23 wm_state_.reset(new ::wm::WMState);
25 } 24 }
26 25
27 void ViewsContentClientMainPartsAura::PostMainMessageLoopRun() { 26 void ViewsContentClientMainPartsAura::PostMainMessageLoopRun() {
28 aura::Env::DeleteInstance();
29
30 ViewsContentClientMainParts::PostMainMessageLoopRun(); 27 ViewsContentClientMainParts::PostMainMessageLoopRun();
31 } 28 }
32 29
33 } // namespace ui 30 } // namespace ui
OLDNEW
« no previous file with comments | « ui/views/run_all_unittests.cc ('k') | ui/views_content_client/views_content_client_main_parts_desktop_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698