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

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

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « ui/app_list/contents_view.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('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 #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
66 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} 66 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
67 virtual void OnWindowDestroying() OVERRIDE {} 67 virtual void OnWindowDestroying() OVERRIDE {}
68 virtual void OnWindowDestroyed() OVERRIDE {} 68 virtual void OnWindowDestroyed() OVERRIDE {}
69 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} 69 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
70 virtual bool HasHitTestMask() const OVERRIDE { return false; } 70 virtual bool HasHitTestMask() const OVERRIDE { return false; }
71 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} 71 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
72 scoped_refptr<ui::Texture> CopyTexture() { 72 scoped_refptr<ui::Texture> CopyTexture() {
73 return scoped_refptr<ui::Texture>(); 73 return scoped_refptr<ui::Texture>();
74 } 74 }
75 75
76 // Overridden from ui::EventHandler:
77 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
78 return ui::ER_UNHANDLED;
79 }
80 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
81 return ui::ER_HANDLED;
82 }
83 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
84 return ui::ER_UNHANDLED;
85 }
86 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
87 return ui::ER_UNHANDLED;
88 }
89
90 private: 76 private:
91 SkColor color_; 77 SkColor color_;
92 78
93 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate); 79 DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
94 }; 80 };
95 81
96 class DemoStackingClient : public aura::client::StackingClient { 82 class DemoStackingClient : public aura::client::StackingClient {
97 public: 83 public:
98 explicit DemoStackingClient(aura::RootWindow* root_window) 84 explicit DemoStackingClient(aura::RootWindow* root_window)
99 : root_window_(root_window) { 85 : root_window_(root_window) {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 161
176 // The exit manager is in charge of calling the dtors of singleton objects. 162 // The exit manager is in charge of calling the dtors of singleton objects.
177 base::AtExitManager exit_manager; 163 base::AtExitManager exit_manager;
178 164
179 ui::RegisterPathProvider(); 165 ui::RegisterPathProvider();
180 icu_util::Initialize(); 166 icu_util::Initialize();
181 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 167 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
182 168
183 return DemoMain(); 169 return DemoMain();
184 } 170 }
OLDNEW
« no previous file with comments | « ui/app_list/contents_view.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698