| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 virtual bool CanFocus() OVERRIDE { return true; } | 62 virtual bool CanFocus() OVERRIDE { return true; } |
| 63 virtual void OnCaptureLost() OVERRIDE {} | 63 virtual void OnCaptureLost() OVERRIDE {} |
| 64 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { | 64 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
| 65 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); | 65 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); |
| 66 } | 66 } |
| 67 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} | 67 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} |
| 68 virtual void OnWindowDestroying() OVERRIDE {} | 68 virtual void OnWindowDestroying() OVERRIDE {} |
| 69 virtual void OnWindowDestroyed() OVERRIDE {} | 69 virtual void OnWindowDestroyed() OVERRIDE {} |
| 70 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {} | 70 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {} |
| 71 virtual bool HasHitTestMask() const OVERRIDE { return false; } |
| 72 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} |
| 71 | 73 |
| 72 private: | 74 private: |
| 73 SkColor color_; | 75 SkColor color_; |
| 74 | 76 |
| 75 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); | 77 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); |
| 76 }; | 78 }; |
| 77 | 79 |
| 78 class DemoStackingClient : public aura::client::StackingClient { | 80 class DemoStackingClient : public aura::client::StackingClient { |
| 79 public: | 81 public: |
| 80 explicit DemoStackingClient(aura::RootWindow* root_window) | 82 explicit DemoStackingClient(aura::RootWindow* root_window) |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 window3.Show(); | 145 window3.Show(); |
| 144 window3.SetParent(&window2); | 146 window3.SetParent(&window2); |
| 145 | 147 |
| 146 root_window->ShowRootWindow(); | 148 root_window->ShowRootWindow(); |
| 147 MessageLoopForUI::current()->Run(); | 149 MessageLoopForUI::current()->Run(); |
| 148 | 150 |
| 149 ui::CompositorTestSupport::Terminate(); | 151 ui::CompositorTestSupport::Terminate(); |
| 150 | 152 |
| 151 return 0; | 153 return 0; |
| 152 } | 154 } |
| OLD | NEW |