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

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

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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"
11 #include "components/html_viewer/discardable_memory_allocator.h" 11 #include "components/html_viewer/discardable_memory_allocator.h"
12 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h"
13 #include "components/mus/gles2/raster_thread_helper.h"
12 #include "components/resource_provider/public/cpp/resource_loader.h" 14 #include "components/resource_provider/public/cpp/resource_loader.h"
13 #include "components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h"
14 #include "components/view_manager/gles2/raster_thread_helper.h"
15 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/size.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 class ApplicationImpl; 18 class ApplicationImpl;
19 class Shell; 19 class Shell;
20 } 20 }
21 21
22 namespace ui { 22 namespace ui {
23 namespace mojo { 23 namespace mojo {
24 class UIInit; 24 class UIInit;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 gles2::RasterThreadHelper raster_thread_helper_; 106 gles2::RasterThreadHelper raster_thread_helper_;
107 gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; 107 gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
108 scoped_ptr<MediaFactory> media_factory_; 108 scoped_ptr<MediaFactory> media_factory_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(GlobalState); 110 DISALLOW_COPY_AND_ASSIGN(GlobalState);
111 }; 111 };
112 112
113 } // namespace html_viewer 113 } // namespace html_viewer
114 114
115 #endif // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ 115 #endif // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_
OLDNEW
« no previous file with comments | « components/html_viewer/document_resource_waiter.cc ('k') | components/html_viewer/html_document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698