| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 return ui::GESTURE_STATUS_UNKNOWN; | 66 return ui::GESTURE_STATUS_UNKNOWN; |
| 67 } | 67 } |
| 68 virtual bool CanFocus() OVERRIDE { return true; } | 68 virtual bool CanFocus() OVERRIDE { return true; } |
| 69 virtual void OnCaptureLost() OVERRIDE {} | 69 virtual void OnCaptureLost() OVERRIDE {} |
| 70 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { | 70 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
| 71 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); | 71 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); |
| 72 } | 72 } |
| 73 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} | 73 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} |
| 74 virtual void OnWindowDestroying() OVERRIDE {} | 74 virtual void OnWindowDestroying() OVERRIDE {} |
| 75 virtual void OnWindowDestroyed() OVERRIDE {} | 75 virtual void OnWindowDestroyed() OVERRIDE {} |
| 76 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {} | 76 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} |
| 77 virtual bool HasHitTestMask() const OVERRIDE { return false; } | 77 virtual bool HasHitTestMask() const OVERRIDE { return false; } |
| 78 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} | 78 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} |
| 79 | 79 |
| 80 private: | 80 private: |
| 81 SkColor color_; | 81 SkColor color_; |
| 82 | 82 |
| 83 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); | 83 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); |
| 84 }; | 84 }; |
| 85 | 85 |
| 86 class DemoStackingClient : public aura::client::StackingClient { | 86 class DemoStackingClient : public aura::client::StackingClient { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 window3.Show(); | 159 window3.Show(); |
| 160 window3.SetParent(&window2); | 160 window3.SetParent(&window2); |
| 161 | 161 |
| 162 root_window->ShowRootWindow(); | 162 root_window->ShowRootWindow(); |
| 163 MessageLoopForUI::current()->Run(); | 163 MessageLoopForUI::current()->Run(); |
| 164 | 164 |
| 165 ui::CompositorTestSupport::Terminate(); | 165 ui::CompositorTestSupport::Terminate(); |
| 166 | 166 |
| 167 return 0; | 167 return 0; |
| 168 } | 168 } |
| OLD | NEW |