| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 return HTCAPTION; | 44 return HTCAPTION; |
| 45 } | 45 } |
| 46 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE { | 46 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE { |
| 47 return true; | 47 return true; |
| 48 } | 48 } |
| 49 virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE { return true; } | 49 virtual bool ShouldActivate(aura::MouseEvent* event) OVERRIDE { return true; } |
| 50 virtual void OnActivated() OVERRIDE {} | 50 virtual void OnActivated() OVERRIDE {} |
| 51 virtual void OnLostActive() OVERRIDE {} | 51 virtual void OnLostActive() OVERRIDE {} |
| 52 virtual void OnCaptureLost() OVERRIDE {} | 52 virtual void OnCaptureLost() OVERRIDE {} |
| 53 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { | 53 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
| 54 canvas->AsCanvasSkia()->drawColor(color_, SkXfermode::kSrc_Mode); | 54 canvas->GetSkCanvas()->drawColor(color_, SkXfermode::kSrc_Mode); |
| 55 } | 55 } |
| 56 virtual void OnWindowDestroying() OVERRIDE {} | 56 virtual void OnWindowDestroying() OVERRIDE {} |
| 57 virtual void OnWindowDestroyed() OVERRIDE {} | 57 virtual void OnWindowDestroyed() OVERRIDE {} |
| 58 | 58 |
| 59 private: | 59 private: |
| 60 SkColor color_; | 60 SkColor color_; |
| 61 | 61 |
| 62 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); | 62 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); |
| 63 }; | 63 }; |
| 64 | 64 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 window3.set_id(3); | 106 window3.set_id(3); |
| 107 window3.Init(); | 107 window3.Init(); |
| 108 window3.SetBounds(gfx::Rect(10, 10, 50, 50)); | 108 window3.SetBounds(gfx::Rect(10, 10, 50, 50)); |
| 109 window3.Show(); | 109 window3.Show(); |
| 110 window3.SetParent(&window2); | 110 window3.SetParent(&window2); |
| 111 | 111 |
| 112 aura::Desktop::GetInstance()->Run(); | 112 aura::Desktop::GetInstance()->Run(); |
| 113 return 0; | 113 return 0; |
| 114 } | 114 } |
| 115 | 115 |
| OLD | NEW |