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

Side by Side Diff: views/widget/widget.h

Issue 6823055: Consolidate OnKeyEvent and InputMethod code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update additional OnEventKey references. Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef VIEWS_WIDGET_WIDGET_H_ 5 #ifndef VIEWS_WIDGET_WIDGET_H_
6 #define VIEWS_WIDGET_WIDGET_H_ 6 #define VIEWS_WIDGET_WIDGET_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 NativeWidget* native_widget() { return native_widget_; } 285 NativeWidget* native_widget() { return native_widget_; }
286 286
287 // Overridden from NativeWidgetDelegate: 287 // Overridden from NativeWidgetDelegate:
288 virtual void OnNativeFocus(gfx::NativeView focused_view) OVERRIDE; 288 virtual void OnNativeFocus(gfx::NativeView focused_view) OVERRIDE;
289 virtual void OnNativeBlur(gfx::NativeView focused_view) OVERRIDE; 289 virtual void OnNativeBlur(gfx::NativeView focused_view) OVERRIDE;
290 virtual void OnNativeWidgetCreated() OVERRIDE; 290 virtual void OnNativeWidgetCreated() OVERRIDE;
291 virtual void OnSizeChanged(const gfx::Size& new_size) OVERRIDE; 291 virtual void OnSizeChanged(const gfx::Size& new_size) OVERRIDE;
292 virtual bool HasFocusManager() const OVERRIDE; 292 virtual bool HasFocusManager() const OVERRIDE;
293 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE; 293 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE;
294 virtual bool OnKeyEvent(const KeyEvent& event) OVERRIDE;
294 virtual bool OnMouseEvent(const MouseEvent& event) OVERRIDE; 295 virtual bool OnMouseEvent(const MouseEvent& event) OVERRIDE;
295 virtual void OnMouseCaptureLost() OVERRIDE; 296 virtual void OnMouseCaptureLost() OVERRIDE;
296 297
297 // Overridden from FocusTraversable: 298 // Overridden from FocusTraversable:
298 virtual FocusSearch* GetFocusSearch() OVERRIDE; 299 virtual FocusSearch* GetFocusSearch() OVERRIDE;
299 virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; 300 virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE;
300 virtual View* GetFocusTraversableParentView() OVERRIDE; 301 virtual View* GetFocusTraversableParentView() OVERRIDE;
301 302
302 protected: 303 protected:
303 // Creates the RootView to be used within this Widget. Subclasses may override 304 // Creates the RootView to be used within this Widget. Subclasses may override
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 369
369 // The compositor for accelerated drawing. 370 // The compositor for accelerated drawing.
370 scoped_refptr<ui::Compositor> compositor_; 371 scoped_refptr<ui::Compositor> compositor_;
371 372
372 DISALLOW_COPY_AND_ASSIGN(Widget); 373 DISALLOW_COPY_AND_ASSIGN(Widget);
373 }; 374 };
374 375
375 } // namespace views 376 } // namespace views
376 377
377 #endif // VIEWS_WIDGET_WIDGET_H_ 378 #endif // VIEWS_WIDGET_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698