Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: ui/aura/demo/demo_main.cc

Issue 10562025: aura: Fix WidgetFocusChangeListener::OnNativeFocusChange(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 21 matching lines...) Expand all
32 class DemoWindowDelegate : public aura::WindowDelegate { 32 class DemoWindowDelegate : public aura::WindowDelegate {
33 public: 33 public:
34 explicit DemoWindowDelegate(SkColor color) : color_(color) {} 34 explicit DemoWindowDelegate(SkColor color) : color_(color) {}
35 35
36 // Overridden from WindowDelegate: 36 // Overridden from WindowDelegate:
37 virtual gfx::Size GetMinimumSize() const OVERRIDE { 37 virtual gfx::Size GetMinimumSize() const OVERRIDE {
38 return gfx::Size(); 38 return gfx::Size();
39 } 39 }
40 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 40 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
41 const gfx::Rect& new_bounds) OVERRIDE {} 41 const gfx::Rect& new_bounds) OVERRIDE {}
42 virtual void OnFocus() OVERRIDE {} 42 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE {}
43 virtual void OnBlur() OVERRIDE {} 43 virtual void OnBlur() OVERRIDE {}
44 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE { 44 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE {
45 return false; 45 return false;
46 } 46 }
47 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { 47 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
48 return gfx::kNullCursor; 48 return gfx::kNullCursor;
49 } 49 }
50 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { 50 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
51 return HTCAPTION; 51 return HTCAPTION;
52 } 52 }
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 window3.Show(); 150 window3.Show();
151 window3.SetParent(&window2); 151 window3.SetParent(&window2);
152 152
153 root_window->ShowRootWindow(); 153 root_window->ShowRootWindow();
154 MessageLoopForUI::current()->Run(); 154 MessageLoopForUI::current()->Run();
155 155
156 ui::CompositorTestSupport::Terminate(); 156 ui::CompositorTestSupport::Terminate();
157 157
158 return 0; 158 return 0;
159 } 159 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698