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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 501583003: Move external popup menus from WebViewClient to WebFrameClient, part 3/3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nicer ipc Created 6 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_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 11 matching lines...) Expand all
22 #include "content/public/common/window_container_type.h" 22 #include "content/public/common/window_container_type.h"
23 #include "net/base/load_states.h" 23 #include "net/base/load_states.h"
24 #include "third_party/WebKit/public/web/WebAXEnums.h" 24 #include "third_party/WebKit/public/web/WebAXEnums.h"
25 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 25 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
26 #include "third_party/WebKit/public/web/WebPopupType.h" 26 #include "third_party/WebKit/public/web/WebPopupType.h"
27 #include "third_party/skia/include/core/SkColor.h" 27 #include "third_party/skia/include/core/SkColor.h"
28 #include "ui/base/window_open_disposition.h" 28 #include "ui/base/window_open_disposition.h"
29 29
30 class SkBitmap; 30 class SkBitmap;
31 class FrameMsg_Navigate; 31 class FrameMsg_Navigate;
32 struct FrameMsg_Navigate_Params;
32 struct MediaPlayerAction; 33 struct MediaPlayerAction;
33 struct ViewHostMsg_CreateWindow_Params; 34 struct ViewHostMsg_CreateWindow_Params;
34 struct ViewHostMsg_ShowPopup_Params;
35 struct FrameMsg_Navigate_Params;
36 struct ViewMsg_PostMessage_Params; 35 struct ViewMsg_PostMessage_Params;
37 36
38 namespace base { 37 namespace base {
39 class ListValue; 38 class ListValue;
40 } 39 }
41 40
42 namespace gfx { 41 namespace gfx {
43 class Range; 42 class Range;
44 } 43 }
45 44
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 const ViewHostMsg_CreateWindow_Params& params, 326 const ViewHostMsg_CreateWindow_Params& params,
328 SessionStorageNamespace* session_storage_namespace); 327 SessionStorageNamespace* session_storage_namespace);
329 328
330 // Creates a new RenderWidget with the given route id. |popup_type| indicates 329 // Creates a new RenderWidget with the given route id. |popup_type| indicates
331 // if this widget is a popup and what kind of popup it is (select, autofill). 330 // if this widget is a popup and what kind of popup it is (select, autofill).
332 void CreateNewWidget(int route_id, blink::WebPopupType popup_type); 331 void CreateNewWidget(int route_id, blink::WebPopupType popup_type);
333 332
334 // Creates a full screen RenderWidget. 333 // Creates a full screen RenderWidget.
335 void CreateNewFullscreenWidget(int route_id); 334 void CreateNewFullscreenWidget(int route_id);
336 335
337 #if defined(OS_MACOSX)
338 // Select popup menu related methods (for external popup menus).
339 void DidSelectPopupMenuItem(int selected_index);
340 void DidCancelPopupMenu();
341 #endif
342
343 #if defined(ENABLE_BROWSER_CDMS) 336 #if defined(ENABLE_BROWSER_CDMS)
344 MediaWebContentsObserver* media_web_contents_observer() { 337 MediaWebContentsObserver* media_web_contents_observer() {
345 return media_web_contents_observer_.get(); 338 return media_web_contents_observer_.get();
346 } 339 }
347 #endif 340 #endif
348 341
349 #if defined(OS_ANDROID)
350 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices);
351 void DidCancelPopupMenu();
352 #endif
353
354 int main_frame_routing_id() const { 342 int main_frame_routing_id() const {
355 return main_frame_routing_id_; 343 return main_frame_routing_id_;
356 } 344 }
357 345
358 // Set the opener to null in the renderer process. 346 // Set the opener to null in the renderer process.
359 void DisownOpener(); 347 void DisownOpener();
360 348
361 bool is_waiting_for_beforeunload_ack() { 349 bool is_waiting_for_beforeunload_ack() {
362 return is_waiting_for_beforeunload_ack_; 350 return is_waiting_for_beforeunload_ack_;
363 } 351 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 const DragEventSourceInfo& event_info); 420 const DragEventSourceInfo& event_info);
433 void OnUpdateDragCursor(blink::WebDragOperation drag_operation); 421 void OnUpdateDragCursor(blink::WebDragOperation drag_operation);
434 void OnTargetDropACK(); 422 void OnTargetDropACK();
435 void OnTakeFocus(bool reverse); 423 void OnTakeFocus(bool reverse);
436 void OnFocusedNodeChanged(bool is_editable_node); 424 void OnFocusedNodeChanged(bool is_editable_node);
437 void OnClosePageACK(); 425 void OnClosePageACK();
438 void OnDidZoomURL(double zoom_level, const GURL& url); 426 void OnDidZoomURL(double zoom_level, const GURL& url);
439 void OnRunFileChooser(const FileChooserParams& params); 427 void OnRunFileChooser(const FileChooserParams& params);
440 void OnFocusedNodeTouched(bool editable); 428 void OnFocusedNodeTouched(bool editable);
441 429
442 #if defined(OS_MACOSX) || defined(OS_ANDROID)
443 void OnShowPopup(const ViewHostMsg_ShowPopup_Params& params);
444 void OnHidePopup();
445 #endif
446
447 private: 430 private:
448 // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate 431 // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate
449 // utility functions and state needed in both classes, while we move frame 432 // utility functions and state needed in both classes, while we move frame
450 // specific code away from this class. 433 // specific code away from this class.
451 friend class RenderFrameHostImpl; 434 friend class RenderFrameHostImpl;
452 friend class TestRenderViewHost; 435 friend class TestRenderViewHost;
453 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost); 436 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost);
454 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane); 437 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane);
455 438
456 // TODO(creis): Move to a private namespace on RenderFrameHostImpl. 439 // TODO(creis): Move to a private namespace on RenderFrameHostImpl.
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 537 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
555 }; 538 };
556 539
557 #if defined(COMPILER_MSVC) 540 #if defined(COMPILER_MSVC)
558 #pragma warning(pop) 541 #pragma warning(pop)
559 #endif 542 #endif
560 543
561 } // namespace content 544 } // namespace content
562 545
563 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 546 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698