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

Side by Side Diff: chrome/browser/guest_view/web_view/web_view_guest.h

Issue 288113005: <webview>: Cleanup Pointer Lock & Simplify HandleKeyboardEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary braces Created 6 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/guest_view/web_view/web_view_guest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 5 #ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
6 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 6 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 virtual void LoadProgressed(double progress) OVERRIDE; 78 virtual void LoadProgressed(double progress) OVERRIDE;
79 virtual void Close() OVERRIDE; 79 virtual void Close() OVERRIDE;
80 virtual void DidAttach() OVERRIDE; 80 virtual void DidAttach() OVERRIDE;
81 virtual void EmbedderDestroyed() OVERRIDE; 81 virtual void EmbedderDestroyed() OVERRIDE;
82 virtual void FindReply(int request_id, 82 virtual void FindReply(int request_id,
83 int number_of_matches, 83 int number_of_matches,
84 const gfx::Rect& selection_rect, 84 const gfx::Rect& selection_rect,
85 int active_match_ordinal, 85 int active_match_ordinal,
86 bool final_update) OVERRIDE; 86 bool final_update) OVERRIDE;
87 virtual void GuestProcessGone(base::TerminationStatus status) OVERRIDE; 87 virtual void GuestProcessGone(base::TerminationStatus status) OVERRIDE;
88 virtual bool HandleKeyboardEvent( 88 virtual void HandleKeyboardEvent(
89 const content::NativeWebKeyboardEvent& event) OVERRIDE; 89 const content::NativeWebKeyboardEvent& event) OVERRIDE;
90 virtual bool IsDragAndDropEnabled() OVERRIDE; 90 virtual bool IsDragAndDropEnabled() OVERRIDE;
91 virtual bool IsOverridingUserAgent() const OVERRIDE; 91 virtual bool IsOverridingUserAgent() const OVERRIDE;
92 virtual void LoadAbort(bool is_top_level, 92 virtual void LoadAbort(bool is_top_level,
93 const GURL& url, 93 const GURL& url,
94 const std::string& error_type) OVERRIDE; 94 const std::string& error_type) OVERRIDE;
95 virtual void RendererResponsive() OVERRIDE; 95 virtual void RendererResponsive() OVERRIDE;
96 virtual void RendererUnresponsive() OVERRIDE; 96 virtual void RendererUnresponsive() OVERRIDE;
97 virtual void RequestPermission( 97 virtual void RequestPermission(
98 BrowserPluginPermissionType permission_type, 98 BrowserPluginPermissionType permission_type,
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 // the bookkeeping for a particular geolocation request associated with the 298 // the bookkeeping for a particular geolocation request associated with the
299 // provided |bridge_id|. It returns the request ID of the geolocation request. 299 // provided |bridge_id|. It returns the request ID of the geolocation request.
300 int RemoveBridgeID(int bridge_id); 300 int RemoveBridgeID(int bridge_id);
301 301
302 int RequestPermissionInternal( 302 int RequestPermissionInternal(
303 BrowserPluginPermissionType permission_type, 303 BrowserPluginPermissionType permission_type,
304 const base::DictionaryValue& request_info, 304 const base::DictionaryValue& request_info,
305 const PermissionResponseCallback& callback, 305 const PermissionResponseCallback& callback,
306 bool allowed_by_default); 306 bool allowed_by_default);
307 307
308 bool HandleKeyboardShortcuts(const content::NativeWebKeyboardEvent& event);
309
308 ObserverList<extensions::TabHelper::ScriptExecutionObserver> 310 ObserverList<extensions::TabHelper::ScriptExecutionObserver>
309 script_observers_; 311 script_observers_;
310 scoped_ptr<extensions::ScriptExecutor> script_executor_; 312 scoped_ptr<extensions::ScriptExecutor> script_executor_;
311 313
312 content::NotificationRegistrar notification_registrar_; 314 content::NotificationRegistrar notification_registrar_;
313 315
314 // A counter to generate a unique request id for a context menu request. 316 // A counter to generate a unique request id for a context menu request.
315 // We only need the ids to be unique for a given WebViewGuest. 317 // We only need the ids to be unique for a given WebViewGuest.
316 int pending_context_menu_request_id_; 318 int pending_context_menu_request_id_;
317 319
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 scoped_ptr<chromeos::AccessibilityStatusSubscription> 358 scoped_ptr<chromeos::AccessibilityStatusSubscription>
357 accessibility_subscription_; 359 accessibility_subscription_;
358 #endif 360 #endif
359 361
360 std::map<int, int> bridge_id_to_request_id_map_; 362 std::map<int, int> bridge_id_to_request_id_map_;
361 363
362 DISALLOW_COPY_AND_ASSIGN(WebViewGuest); 364 DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
363 }; 365 };
364 366
365 #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_ 367 #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698