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

Side by Side Diff: components/html_viewer/global_state.h

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase Created 5 years, 2 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 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 COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
6 #define COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ 6 #define COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 74
75 gles2::RasterThreadHelper* raster_thread_helper() { 75 gles2::RasterThreadHelper* raster_thread_helper() {
76 return &raster_thread_helper_; 76 return &raster_thread_helper_;
77 } 77 }
78 78
79 mus::MojoGpuMemoryBufferManager* gpu_memory_buffer_manager() { 79 mus::MojoGpuMemoryBufferManager* gpu_memory_buffer_manager() {
80 return &gpu_memory_buffer_manager_; 80 return &gpu_memory_buffer_manager_;
81 } 81 }
82 82
83 const mojo::GpuInfo* GetGpuInfo(); 83 const mus::mojom::GpuInfo* GetGpuInfo();
84 84
85 MediaFactory* media_factory() { return media_factory_.get(); } 85 MediaFactory* media_factory() { return media_factory_.get(); }
86 86
87 BlinkSettings* blink_settings() { return &blink_settings_; } 87 BlinkSettings* blink_settings() { return &blink_settings_; }
88 88
89 private: 89 private:
90 // Callback for |gpu_service_|->GetGpuInfo(). 90 // Callback for |gpu_service_|->GetGpuInfo().
91 void GetGpuInfoCallback(mojo::GpuInfoPtr gpu_info); 91 void GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info);
92 92
93 // App for HTMLViewer, not the document's app. 93 // App for HTMLViewer, not the document's app.
94 // WARNING: do not expose this. It's too easy to use the wrong one. 94 // WARNING: do not expose this. It's too easy to use the wrong one.
95 // HTMLDocument should be using the application it creates, not this one. 95 // HTMLDocument should be using the application it creates, not this one.
96 mojo::ApplicationImpl* app_; 96 mojo::ApplicationImpl* app_;
97 97
98 resource_provider::ResourceLoader resource_loader_; 98 resource_provider::ResourceLoader resource_loader_;
99 99
100 // True once we've completed init. 100 // True once we've completed init.
101 bool did_init_; 101 bool did_init_;
(...skipping 10 matching lines...) Expand all
112 // 112 //
113 // TODO(erg): In the long run, delete this allocator and get the real shared 113 // TODO(erg): In the long run, delete this allocator and get the real shared
114 // memory based purging allocator working here. 114 // memory based purging allocator working here.
115 DiscardableMemoryAllocator discardable_memory_allocator_; 115 DiscardableMemoryAllocator discardable_memory_allocator_;
116 116
117 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_; 117 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_;
118 scoped_ptr<BlinkPlatformImpl> blink_platform_; 118 scoped_ptr<BlinkPlatformImpl> blink_platform_;
119 base::Thread compositor_thread_; 119 base::Thread compositor_thread_;
120 gles2::RasterThreadHelper raster_thread_helper_; 120 gles2::RasterThreadHelper raster_thread_helper_;
121 mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; 121 mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
122 mojo::GpuPtr gpu_service_; 122 mus::mojom::GpuPtr gpu_service_;
123 mojo::GpuInfoPtr gpu_info_; 123 mus::mojom::GpuInfoPtr gpu_info_;
124 scoped_ptr<MediaFactory> media_factory_; 124 scoped_ptr<MediaFactory> media_factory_;
125 125
126 BlinkSettings blink_settings_; 126 BlinkSettings blink_settings_;
127 127
128 #if defined(OS_LINUX) && !defined(OS_ANDROID) 128 #if defined(OS_LINUX) && !defined(OS_ANDROID)
129 skia::RefPtr<font_service::FontLoader> font_loader_; 129 skia::RefPtr<font_service::FontLoader> font_loader_;
130 #endif 130 #endif
131 131
132 DISALLOW_COPY_AND_ASSIGN(GlobalState); 132 DISALLOW_COPY_AND_ASSIGN(GlobalState);
133 }; 133 };
134 134
135 } // namespace html_viewer 135 } // namespace html_viewer
136 136
137 #endif // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ 137 #endif // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
OLDNEW
« no previous file with comments | « components/html_viewer/document_resource_waiter.cc ('k') | components/html_viewer/global_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698