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

Side by Side Diff: content/browser/compositor/software_output_device_ozone.h

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
7 7
8 #include "base/macros.h"
8 #include "cc/output/software_output_device.h" 9 #include "cc/output/software_output_device.h"
9 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
10 #include "ui/gfx/native_widget_types.h" 11 #include "ui/gfx/native_widget_types.h"
11 12
12 namespace ui { 13 namespace ui {
13 class Compositor; 14 class Compositor;
14 class SurfaceOzoneCanvas; 15 class SurfaceOzoneCanvas;
15 } 16 }
16 17
17 namespace content { 18 namespace content {
(...skipping 16 matching lines...) Expand all
34 ui::Compositor* compositor_; 35 ui::Compositor* compositor_;
35 36
36 scoped_ptr<ui::SurfaceOzoneCanvas> surface_ozone_; 37 scoped_ptr<ui::SurfaceOzoneCanvas> surface_ozone_;
37 38
38 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone); 39 DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzone);
39 }; 40 };
40 41
41 } // namespace content 42 } // namespace content
42 43
43 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_ 44 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_OZONE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698