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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_aura.cc

Issue 1297173003: Revert of aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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"
7 #include "ui/wm/core/wm_state.h" 8 #include "ui/wm/core/wm_state.h"
8 9
9 namespace ui { 10 namespace ui {
10 11
11 ViewsContentClientMainPartsAura::ViewsContentClientMainPartsAura( 12 ViewsContentClientMainPartsAura::ViewsContentClientMainPartsAura(
12 const content::MainFunctionParams& content_params, 13 const content::MainFunctionParams& content_params,
13 ViewsContentClient* views_content_client) 14 ViewsContentClient* views_content_client)
14 : ViewsContentClientMainParts(content_params, views_content_client) { 15 : ViewsContentClientMainParts(content_params, views_content_client) {
15 } 16 }
16 17
17 ViewsContentClientMainPartsAura::~ViewsContentClientMainPartsAura() { 18 ViewsContentClientMainPartsAura::~ViewsContentClientMainPartsAura() {
18 } 19 }
19 20
20 void ViewsContentClientMainPartsAura::ToolkitInitialized() { 21 void ViewsContentClientMainPartsAura::ToolkitInitialized() {
21 ViewsContentClientMainParts::ToolkitInitialized(); 22 ViewsContentClientMainParts::ToolkitInitialized();
22 23
23 wm_state_.reset(new ::wm::WMState); 24 wm_state_.reset(new ::wm::WMState);
24 } 25 }
25 26
26 void ViewsContentClientMainPartsAura::PostMainMessageLoopRun() { 27 void ViewsContentClientMainPartsAura::PostMainMessageLoopRun() {
28 aura::Env::DeleteInstance();
29
27 ViewsContentClientMainParts::PostMainMessageLoopRun(); 30 ViewsContentClientMainParts::PostMainMessageLoopRun();
28 } 31 }
29 32
30 } // namespace ui 33 } // 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