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

Side by Side Diff: content/browser/android/content_view_core_impl.h

Issue 10913277: Upstream ContentViewCore.pageUp/pageDown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_helper.h" 10 #include "base/android/jni_helper.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 // Creates a popup menu with |items|. 135 // Creates a popup menu with |items|.
136 // |multiple| defines if it should support multi-select. 136 // |multiple| defines if it should support multi-select.
137 // If not |multiple|, |selected_item| sets the initially selected item. 137 // If not |multiple|, |selected_item| sets the initially selected item.
138 // Otherwise, item's "checked" flag selects it. 138 // Otherwise, item's "checked" flag selects it.
139 void ShowSelectPopupMenu(const std::vector<WebMenuItem>& items, 139 void ShowSelectPopupMenu(const std::vector<WebMenuItem>& items,
140 int selected_item, 140 int selected_item,
141 bool multiple); 141 bool multiple);
142 142
143 void OnTabCrashed(const base::ProcessHandle handle); 143 void OnTabCrashed(const base::ProcessHandle handle);
144 virtual void UpdateContentSize(int width, int height) OVERRIDE;
Ted C 2012/09/18 00:21:40 are these defined in content_view_core.h? If not,
Ramya 2012/09/21 00:06:29 Done.
145 virtual void UpdateScrollOffsetAndPageScaleFactor(int x, int y,
146 float scale) OVERRIDE;
144 void ImeUpdateAdapter(int native_ime_adapter, int text_input_type, 147 void ImeUpdateAdapter(int native_ime_adapter, int text_input_type,
145 const std::string& text, 148 const std::string& text,
146 int selection_start, int selection_end, 149 int selection_start, int selection_end,
147 int composition_start, int composition_end, 150 int composition_start, int composition_end,
148 bool show_ime_if_needed); 151 bool show_ime_if_needed);
149 void SetTitle(const string16& title); 152 void SetTitle(const string16& title);
150 153
151 bool HasFocus(); 154 bool HasFocus();
152 void ConfirmTouchEvent(bool handled); 155 void ConfirmTouchEvent(bool handled);
153 void DidSetNeedTouchEvents(bool need_touch_events); 156 void DidSetNeedTouchEvents(bool need_touch_events);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 bool tab_crashed_; 220 bool tab_crashed_;
218 221
219 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 222 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
220 }; 223 };
221 224
222 bool RegisterContentViewCore(JNIEnv* env); 225 bool RegisterContentViewCore(JNIEnv* env);
223 226
224 } // namespace content 227 } // namespace content
225 228
226 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 229 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698