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

Side by Side Diff: mandoline/ui/aura/aura_init.h

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
« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | mandoline/ui/aura/aura_init.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 #ifndef MANDOLINE_UI_AURA_AURA_INIT_H_ 5 #ifndef MANDOLINE_UI_AURA_AURA_INIT_H_
6 #define MANDOLINE_UI_AURA_AURA_INIT_H_ 6 #define MANDOLINE_UI_AURA_AURA_INIT_H_
7 7
8 #include "ui/mojo/init/ui_init.h" 8 #include "ui/mojo/init/ui_init.h"
9 9
10 namespace aura {
11 class Env;
12 }
13
14 namespace mojo { 10 namespace mojo {
15 class Shell; 11 class Shell;
16 class View; 12 class View;
17 } 13 }
18 14
19 namespace mandoline { 15 namespace mandoline {
20 16
21 // Sets up necessary state for aura when run with the viewmanager. 17 // Sets up necessary state for aura when run with the viewmanager.
22 class AuraInit { 18 class AuraInit {
23 public: 19 public:
24 AuraInit(mojo::View* root, mojo::Shell* shell); 20 AuraInit(mojo::View* root, mojo::Shell* shell);
25 ~AuraInit(); 21 ~AuraInit();
26 22
27 private: 23 private:
28 void InitializeResources(mojo::Shell* shell); 24 void InitializeResources(mojo::Shell* shell);
29 25
30 scoped_ptr<aura::Env> env_;
31 ui::mojo::UIInit ui_init_; 26 ui::mojo::UIInit ui_init_;
32 27
33 DISALLOW_COPY_AND_ASSIGN(AuraInit); 28 DISALLOW_COPY_AND_ASSIGN(AuraInit);
34 }; 29 };
35 30
36 } // namespace mandoline 31 } // namespace mandoline
37 32
38 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_ 33 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_views.cc ('k') | mandoline/ui/aura/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698