| commit | 94a0d258287787cf09854492ce889eb14273c059 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Mar 09 00:30:59 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Mar 09 00:30:59 2012 |
| tree | ff242b01f90ee3888fd10a1583b03268b9a15eb0 | |
| parent | fbddf8352b68292d26191060d37c3f0820c8875c [diff] [blame] |
ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. The final goal is to merge these two classes into a single gfx::Canvas class. BUG=116572 [email protected],[email protected] [email protected] Review URL: https://chromiumcodereview.appspot.com/9562038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index d6eccc2..be1c684 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc
@@ -15,7 +15,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/aura/root_window.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/compositor/test/compositor_test_support.h" #include "ui/gfx/rect.h"