| 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/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 virtual void OnCaptureLost() OVERRIDE {} | 60 virtual void OnCaptureLost() OVERRIDE {} |
| 61 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { | 61 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { |
| 62 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); | 62 canvas->DrawColor(color_, SkXfermode::kSrc_Mode); |
| 63 } | 63 } |
| 64 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} | 64 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} |
| 65 virtual void OnWindowDestroying() OVERRIDE {} | 65 virtual void OnWindowDestroying() OVERRIDE {} |
| 66 virtual void OnWindowDestroyed() OVERRIDE {} | 66 virtual void OnWindowDestroyed() OVERRIDE {} |
| 67 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} | 67 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} |
| 68 virtual bool HasHitTestMask() const OVERRIDE { return false; } | 68 virtual bool HasHitTestMask() const OVERRIDE { return false; } |
| 69 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} | 69 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} |
| 70 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE { | 70 virtual void DidRecreateLayer(ui::Layer* old_layer, |
| 71 return scoped_refptr<ui::Texture>(); | 71 ui::Layer* new_layer) OVERRIDE {} |
| 72 } | |
| 73 | 72 |
| 74 private: | 73 private: |
| 75 SkColor color_; | 74 SkColor color_; |
| 76 | 75 |
| 77 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); | 76 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); |
| 78 }; | 77 }; |
| 79 | 78 |
| 80 class DemoStackingClient : public aura::client::StackingClient { | 79 class DemoStackingClient : public aura::client::StackingClient { |
| 81 public: | 80 public: |
| 82 explicit DemoStackingClient(aura::RootWindow* root_window) | 81 explicit DemoStackingClient(aura::RootWindow* root_window) |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 | 157 |
| 159 // The exit manager is in charge of calling the dtors of singleton objects. | 158 // The exit manager is in charge of calling the dtors of singleton objects. |
| 160 base::AtExitManager exit_manager; | 159 base::AtExitManager exit_manager; |
| 161 | 160 |
| 162 ui::RegisterPathProvider(); | 161 ui::RegisterPathProvider(); |
| 163 base::i18n::InitializeICU(); | 162 base::i18n::InitializeICU(); |
| 164 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 163 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 165 | 164 |
| 166 return DemoMain(); | 165 return DemoMain(); |
| 167 } | 166 } |
| OLD | NEW |