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

Side by Side Diff: ui/views/mus/aura_init.h

Issue 2591863004: mus: aura::Env should be destroyed last in the mus client. (Closed)
Patch Set: . Created 4 years 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 | « ui/aura/mus/focus_synchronizer.cc ('k') | ui/views/mus/mus_client.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 UI_VIEWS_MUS_AURA_INIT_H_ 5 #ifndef UI_VIEWS_MUS_AURA_INIT_H_
6 #define UI_VIEWS_MUS_AURA_INIT_H_ 6 #define UI_VIEWS_MUS_AURA_INIT_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 private: 68 private:
69 void InitializeResources(service_manager::Connector* connector); 69 void InitializeResources(service_manager::Connector* connector);
70 70
71 #if defined(OS_LINUX) 71 #if defined(OS_LINUX)
72 sk_sp<font_service::FontLoader> font_loader_; 72 sk_sp<font_service::FontLoader> font_loader_;
73 #endif 73 #endif
74 74
75 const std::string resource_file_; 75 const std::string resource_file_;
76 const std::string resource_file_200_; 76 const std::string resource_file_200_;
77 77
78 std::unique_ptr<aura::Env> env_;
78 std::unique_ptr<MusClient> mus_client_; 79 std::unique_ptr<MusClient> mus_client_;
79 std::unique_ptr<aura::Env> env_;
80 std::unique_ptr<ViewsDelegate> views_delegate_; 80 std::unique_ptr<ViewsDelegate> views_delegate_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(AuraInit); 82 DISALLOW_COPY_AND_ASSIGN(AuraInit);
83 }; 83 };
84 84
85 } // namespace views 85 } // namespace views
86 86
87 #endif // UI_VIEWS_MUS_AURA_INIT_H_ 87 #endif // UI_VIEWS_MUS_AURA_INIT_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/focus_synchronizer.cc ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698