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

Side by Side Diff: ui/views/controls/webview/webview.h

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « ui/views/controls/tree/tree_view_views.cc ('k') | ui/views/controls/webview/webview.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 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 6 #define UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/public/browser/notification_observer.h" 9 #include "content/public/browser/notification_observer.h"
10 #include "content/public/browser/notification_registrar.h" 10 #include "content/public/browser/notification_registrar.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Overridden from View: 76 // Overridden from View:
77 virtual std::string GetClassName() const OVERRIDE; 77 virtual std::string GetClassName() const OVERRIDE;
78 78
79 private: 79 private:
80 // Overridden from View: 80 // Overridden from View:
81 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; 81 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
82 virtual void ViewHierarchyChanged(bool is_add, 82 virtual void ViewHierarchyChanged(bool is_add,
83 View* parent, 83 View* parent,
84 View* child) OVERRIDE; 84 View* child) OVERRIDE;
85 virtual bool SkipDefaultKeyEventProcessing( 85 virtual bool SkipDefaultKeyEventProcessing(
86 const views::KeyEvent& event) OVERRIDE; 86 const ui::KeyEvent& event) OVERRIDE;
87 virtual bool IsFocusable() const OVERRIDE; 87 virtual bool IsFocusable() const OVERRIDE;
88 virtual void OnFocus() OVERRIDE; 88 virtual void OnFocus() OVERRIDE;
89 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; 89 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
90 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 90 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
91 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; 91 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
92 virtual gfx::Size GetPreferredSize() OVERRIDE; 92 virtual gfx::Size GetPreferredSize() OVERRIDE;
93 93
94 // Overridden from content::NotificationObserver: 94 // Overridden from content::NotificationObserver:
95 virtual void Observe(int type, 95 virtual void Observe(int type,
96 const content::NotificationSource& source, 96 const content::NotificationSource& source,
(...skipping 23 matching lines...) Expand all
120 content::NotificationRegistrar registrar_; 120 content::NotificationRegistrar registrar_;
121 bool allow_accelerators_; 121 bool allow_accelerators_;
122 gfx::Size preferred_size_; 122 gfx::Size preferred_size_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(WebView); 124 DISALLOW_COPY_AND_ASSIGN(WebView);
125 }; 125 };
126 126
127 } // namespace views 127 } // namespace views
128 128
129 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_ 129 #endif // UI_VIEWS_CONTROLS_WEBVIEW_WEBVIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/tree/tree_view_views.cc ('k') | ui/views/controls/webview/webview.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698