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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/canvas_direct2d.h

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert bad indentation, rebase Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_win_unittest.cc ('k') | ui/gfx/canvas_direct2d.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas_direct2d.h
diff --git a/ui/gfx/canvas_direct2d.h b/ui/gfx/canvas_direct2d.h
index 88ab8bfc4e5b0d9ce1857d27a95fbbf67ca54ef3..83a439c9fa56531a6a846d88bb72774eaf1214f6 100644
--- a/ui/gfx/canvas_direct2d.h
+++ b/ui/gfx/canvas_direct2d.h
@@ -10,7 +10,7 @@
#include <stack>
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
#include "ui/gfx/canvas.h"
namespace gfx {
@@ -86,8 +86,8 @@ class CanvasDirect2D : public Canvas {
void SaveInternal(ID2D1Layer* layer);
ID2D1RenderTarget* rt_;
- ScopedComPtr<ID2D1GdiInteropRenderTarget> interop_rt_;
- ScopedComPtr<ID2D1DrawingStateBlock> drawing_state_block_;
+ base::win::ScopedComPtr<ID2D1GdiInteropRenderTarget> interop_rt_;
+ base::win::ScopedComPtr<ID2D1DrawingStateBlock> drawing_state_block_;
static ID2D1Factory* d2d1_factory_;
// Every time Save* is called, a RenderState object is pushed onto the
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_win_unittest.cc ('k') | ui/gfx/canvas_direct2d.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698