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

Side by Side Diff: mojo/shell/context.cc

Issue 460743002: mojo: Reland "Convert gles2 to the new thunking system." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use the mojo_gles2_for_loadable_module variable in more places. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "mojo/shell/context.h" 5 #include "mojo/shell/context.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/strings/string_split.h" 12 #include "base/strings/string_split.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "mojo/application_manager/application_loader.h" 14 #include "mojo/application_manager/application_loader.h"
15 #include "mojo/application_manager/application_manager.h" 15 #include "mojo/application_manager/application_manager.h"
16 #include "mojo/application_manager/background_shell_application_loader.h" 16 #include "mojo/application_manager/background_shell_application_loader.h"
17 #include "mojo/embedder/embedder.h" 17 #include "mojo/embedder/embedder.h"
18 #include "mojo/gles2/gles2_support_impl.h"
19 #include "mojo/public/cpp/application/application_impl.h" 18 #include "mojo/public/cpp/application/application_impl.h"
20 #include "mojo/services/native_viewport/native_viewport_service.h" 19 #include "mojo/services/native_viewport/native_viewport_service.h"
21 #include "mojo/shell/dynamic_application_loader.h" 20 #include "mojo/shell/dynamic_application_loader.h"
22 #include "mojo/shell/in_process_dynamic_service_runner.h" 21 #include "mojo/shell/in_process_dynamic_service_runner.h"
23 #include "mojo/shell/out_of_process_dynamic_service_runner.h" 22 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
24 #include "mojo/shell/switches.h" 23 #include "mojo/shell/switches.h"
25 #include "mojo/shell/ui_application_loader_android.h" 24 #include "mojo/shell/ui_application_loader_android.h"
26 #include "mojo/spy/spy.h" 25 #include "mojo/spy/spy.h"
27 26
28 #if defined(OS_LINUX) 27 #if defined(OS_LINUX)
(...skipping 16 matching lines...) Expand all
45 // correspond to shared libraries bundled alongside the mojo_shell. 44 // correspond to shared libraries bundled alongside the mojo_shell.
46 const char* kLocalMojoURLs[] = { 45 const char* kLocalMojoURLs[] = {
47 "mojo:mojo_network_service", 46 "mojo:mojo_network_service",
48 }; 47 };
49 48
50 // Used to ensure we only init once. 49 // Used to ensure we only init once.
51 class Setup { 50 class Setup {
52 public: 51 public:
53 Setup() { 52 Setup() {
54 embedder::Init(); 53 embedder::Init();
55 gles2::GLES2SupportImpl::Init();
56 } 54 }
57 55
58 ~Setup() { 56 ~Setup() {
59 } 57 }
60 58
61 private: 59 private:
62 DISALLOW_COPY_AND_ASSIGN(Setup); 60 DISALLOW_COPY_AND_ASSIGN(Setup);
63 }; 61 };
64 62
65 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER; 63 static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 } 190 }
193 #endif 191 #endif
194 } 192 }
195 193
196 Context::~Context() { 194 Context::~Context() {
197 DCHECK(!base::MessageLoop::current()); 195 DCHECK(!base::MessageLoop::current());
198 } 196 }
199 197
200 } // namespace shell 198 } // namespace shell
201 } // namespace mojo 199 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/platform/native/thunk_export.h ('k') | mojo/shell/in_process_dynamic_service_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698