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

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: Apply feedback from comments 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 // Creates a popup menu with |items|. 142 // Creates a popup menu with |items|.
143 // |multiple| defines if it should support multi-select. 143 // |multiple| defines if it should support multi-select.
144 // If not |multiple|, |selected_item| sets the initially selected item. 144 // If not |multiple|, |selected_item| sets the initially selected item.
145 // Otherwise, item's "checked" flag selects it. 145 // Otherwise, item's "checked" flag selects it.
146 void ShowSelectPopupMenu(const std::vector<WebMenuItem>& items, 146 void ShowSelectPopupMenu(const std::vector<WebMenuItem>& items,
147 int selected_item, 147 int selected_item,
148 bool multiple); 148 bool multiple);
149 149
150 void OnTabCrashed(const base::ProcessHandle handle); 150 void OnTabCrashed(const base::ProcessHandle handle);
151 virtual void UpdateContentSize(int width, int height) OVERRIDE;
Ted C 2012/09/21 00:29:48 if we remove these from content_view_core.h, we ca
Ramya 2012/09/21 01:12:43 Done.
152 virtual void UpdateScrollOffsetAndPageScaleFactor(int x, int y,
153 float scale) OVERRIDE;
151 void ImeUpdateAdapter(int native_ime_adapter, int text_input_type, 154 void ImeUpdateAdapter(int native_ime_adapter, int text_input_type,
152 const std::string& text, 155 const std::string& text,
153 int selection_start, int selection_end, 156 int selection_start, int selection_end,
154 int composition_start, int composition_end, 157 int composition_start, int composition_end,
155 bool show_ime_if_needed); 158 bool show_ime_if_needed);
156 void SetTitle(const string16& title); 159 void SetTitle(const string16& title);
157 160
158 bool HasFocus(); 161 bool HasFocus();
159 void ConfirmTouchEvent(bool handled); 162 void ConfirmTouchEvent(bool handled);
160 void DidSetNeedTouchEvents(bool need_touch_events); 163 void DidSetNeedTouchEvents(bool need_touch_events);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 ui::WindowAndroid* window_android_; 230 ui::WindowAndroid* window_android_;
228 231
229 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 232 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
230 }; 233 };
231 234
232 bool RegisterContentViewCore(JNIEnv* env); 235 bool RegisterContentViewCore(JNIEnv* env);
233 236
234 } // namespace content 237 } // namespace content
235 238
236 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 239 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698