| OLD | NEW | 
|    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/macros.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 "build/build_config.h" | 
|   11 #include "components/html_viewer/blink_settings.h" |   12 #include "components/html_viewer/blink_settings.h" | 
|   12 #include "components/html_viewer/discardable_memory_allocator.h" |   13 #include "components/html_viewer/discardable_memory_allocator.h" | 
|   13 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h" |   14 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h" | 
|   14 #include "components/mus/gles2/raster_thread_helper.h" |   15 #include "components/mus/gles2/raster_thread_helper.h" | 
|   15 #include "components/mus/public/interfaces/gpu.mojom.h" |   16 #include "components/mus/public/interfaces/gpu.mojom.h" | 
|   16 #include "components/resource_provider/public/cpp/resource_loader.h" |   17 #include "components/resource_provider/public/cpp/resource_loader.h" | 
|   17 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |   18 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 
|   18 #include "skia/ext/refptr.h" |   19 #include "skia/ext/refptr.h" | 
|   19 #include "ui/gfx/geometry/size.h" |   20 #include "ui/gfx/geometry/size.h" | 
|   20  |   21  | 
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  134 #if defined(OS_LINUX) && !defined(OS_ANDROID) |  135 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 
|  135   skia::RefPtr<font_service::FontLoader> font_loader_; |  136   skia::RefPtr<font_service::FontLoader> font_loader_; | 
|  136 #endif |  137 #endif | 
|  137  |  138  | 
|  138   DISALLOW_COPY_AND_ASSIGN(GlobalState); |  139   DISALLOW_COPY_AND_ASSIGN(GlobalState); | 
|  139 }; |  140 }; | 
|  140  |  141  | 
|  141 }  // namespace html_viewer |  142 }  // namespace html_viewer | 
|  142  |  143  | 
|  143 #endif  // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ |  144 #endif  // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ | 
| OLD | NEW |