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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 virtual gfx::Size GetMinimumSize() const OVERRIDE { | 42 virtual gfx::Size GetMinimumSize() const OVERRIDE { |
43 return gfx::Size(); | 43 return gfx::Size(); |
44 } | 44 } |
45 | 45 |
46 virtual gfx::Size GetMaximumSize() const OVERRIDE { | 46 virtual gfx::Size GetMaximumSize() const OVERRIDE { |
47 return gfx::Size(); | 47 return gfx::Size(); |
48 } | 48 } |
49 | 49 |
50 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 50 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
51 const gfx::Rect& new_bounds) OVERRIDE {} | 51 const gfx::Rect& new_bounds) OVERRIDE {} |
| 52 virtual void OnPropertyChanged(const void* key, intptr_t old) OVERRIDE {} |
52 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { | 53 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { |
53 return gfx::kNullCursor; | 54 return gfx::kNullCursor; |
54 } | 55 } |
55 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { | 56 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { |
56 return HTCAPTION; | 57 return HTCAPTION; |
57 } | 58 } |
58 virtual bool ShouldDescendIntoChildForEventHandling( | 59 virtual bool ShouldDescendIntoChildForEventHandling( |
59 aura::Window* child, | 60 aura::Window* child, |
60 const gfx::Point& location) OVERRIDE { | 61 const gfx::Point& location) OVERRIDE { |
61 return true; | 62 return true; |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 int main(int argc, char** argv) { | 176 int main(int argc, char** argv) { |
176 CommandLine::Init(argc, argv); | 177 CommandLine::Init(argc, argv); |
177 | 178 |
178 // The exit manager is in charge of calling the dtors of singleton objects. | 179 // The exit manager is in charge of calling the dtors of singleton objects. |
179 base::AtExitManager exit_manager; | 180 base::AtExitManager exit_manager; |
180 | 181 |
181 base::i18n::InitializeICU(); | 182 base::i18n::InitializeICU(); |
182 | 183 |
183 return DemoMain(); | 184 return DemoMain(); |
184 } | 185 } |
OLD | NEW |