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

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

Issue 213383007: Revert of Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « mojo/examples/aura_demo/aura_demo.cc ('k') | ui/aura/test/test_window_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #if defined(USE_X11) 5 #if defined(USE_X11)
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 #endif 7 #endif
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
53 return gfx::kNullCursor;
54 }
52 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { 55 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
53 return HTCAPTION; 56 return HTCAPTION;
54 } 57 }
55 virtual bool ShouldDescendIntoChildForEventHandling( 58 virtual bool ShouldDescendIntoChildForEventHandling(
56 aura::Window* child, 59 aura::Window* child,
57 const gfx::Point& location) OVERRIDE { 60 const gfx::Point& location) OVERRIDE {
58 return true; 61 return true;
59 } 62 }
60 virtual bool CanFocus() OVERRIDE { return true; } 63 virtual bool CanFocus() OVERRIDE { return true; }
61 virtual void OnCaptureLost() OVERRIDE {} 64 virtual void OnCaptureLost() OVERRIDE {}
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 int main(int argc, char** argv) { 172 int main(int argc, char** argv) {
170 CommandLine::Init(argc, argv); 173 CommandLine::Init(argc, argv);
171 174
172 // The exit manager is in charge of calling the dtors of singleton objects. 175 // The exit manager is in charge of calling the dtors of singleton objects.
173 base::AtExitManager exit_manager; 176 base::AtExitManager exit_manager;
174 177
175 base::i18n::InitializeICU(); 178 base::i18n::InitializeICU();
176 179
177 return DemoMain(); 180 return DemoMain();
178 } 181 }
OLDNEW
« no previous file with comments | « mojo/examples/aura_demo/aura_demo.cc ('k') | ui/aura/test/test_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698