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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 10377170: Browser Plugin: browser process side changes (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated according to creis@ Created 8 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 | 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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "base/property_bag.h" 16 #include "base/property_bag.h"
17 #include "content/browser/browser_plugin/browser_plugin_host.h"
17 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h" 18 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager .h"
18 #include "content/browser/renderer_host/render_widget_host_delegate.h" 19 #include "content/browser/renderer_host/render_widget_host_delegate.h"
19 #include "content/browser/web_contents/navigation_controller_impl.h" 20 #include "content/browser/web_contents/navigation_controller_impl.h"
20 #include "content/browser/web_contents/render_view_host_manager.h" 21 #include "content/browser/web_contents/render_view_host_manager.h"
21 #include "content/common/content_export.h" 22 #include "content/common/content_export.h"
22 #include "content/public/browser/notification_observer.h" 23 #include "content/public/browser/notification_observer.h"
23 #include "content/public/browser/notification_registrar.h" 24 #include "content/public/browser/notification_registrar.h"
24 #include "content/public/browser/render_view_host_delegate.h" 25 #include "content/public/browser/render_view_host_delegate.h"
25 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
26 #include "content/public/common/renderer_preferences.h" 27 #include "content/public/common/renderer_preferences.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 127 }
127 128
128 void set_opener_web_ui_type(content::WebUI::TypeID opener_web_ui_type) { 129 void set_opener_web_ui_type(content::WebUI::TypeID opener_web_ui_type) {
129 opener_web_ui_type_ = opener_web_ui_type; 130 opener_web_ui_type_ = opener_web_ui_type;
130 } 131 }
131 132
132 JavaBridgeDispatcherHostManager* java_bridge_dispatcher_host_manager() const { 133 JavaBridgeDispatcherHostManager* java_bridge_dispatcher_host_manager() const {
133 return java_bridge_dispatcher_host_manager_.get(); 134 return java_bridge_dispatcher_host_manager_.get();
134 } 135 }
135 136
137 content::BrowserPluginHost* browser_plugin_host() const {
138 return browser_plugin_host_.get();
139 }
140
136 // Like GetController from WebContents, but returns the concrete object. 141 // Like GetController from WebContents, but returns the concrete object.
137 NavigationControllerImpl& GetControllerImpl(); 142 NavigationControllerImpl& GetControllerImpl();
138 143
139 // Expose the render manager for testing. 144 // Expose the render manager for testing.
140 RenderViewHostManager* GetRenderManagerForTesting(); 145 RenderViewHostManager* GetRenderManagerForTesting();
141 146
142 // content::WebContents ------------------------------------------------------ 147 // content::WebContents ------------------------------------------------------
143 virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE; 148 virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
144 virtual base::PropertyBag* GetPropertyBag() OVERRIDE; 149 virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
145 virtual content::WebContentsDelegate* GetDelegate() OVERRIDE; 150 virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 virtual void HandleMouseActivate() OVERRIDE; 357 virtual void HandleMouseActivate() OVERRIDE;
353 virtual void RunFileChooser( 358 virtual void RunFileChooser(
354 content::RenderViewHost* render_view_host, 359 content::RenderViewHost* render_view_host,
355 const content::FileChooserParams& params) OVERRIDE; 360 const content::FileChooserParams& params) OVERRIDE;
356 virtual void ToggleFullscreenMode(bool enter_fullscreen) OVERRIDE; 361 virtual void ToggleFullscreenMode(bool enter_fullscreen) OVERRIDE;
357 virtual bool IsFullscreenForCurrentTab() const OVERRIDE; 362 virtual bool IsFullscreenForCurrentTab() const OVERRIDE;
358 virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE; 363 virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE;
359 virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE; 364 virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE;
360 virtual void RequestToLockMouse(bool user_gesture) OVERRIDE; 365 virtual void RequestToLockMouse(bool user_gesture) OVERRIDE;
361 virtual void LostMouseLock() OVERRIDE; 366 virtual void LostMouseLock() OVERRIDE;
367 virtual void ConnectEmbedderToChannel(
368 content::RenderViewHost* render_view_host,
369 const IPC::ChannelHandle& channel_handle) OVERRIDE;
370 virtual void NavigateGuestFromEmbedder(
371 content::RenderViewHost* render_view_host,
372 int container_instance_id,
373 long long frame_id,
374 const std::string& src,
375 const gfx::Size& size) OVERRIDE;
362 376
363 // RenderWidgetHostDelegate -------------------------------------------------- 377 // RenderWidgetHostDelegate --------------------------------------------------
364 378
365 virtual bool PreHandleKeyboardEvent( 379 virtual bool PreHandleKeyboardEvent(
366 const content::NativeWebKeyboardEvent& event, 380 const content::NativeWebKeyboardEvent& event,
367 bool* is_keyboard_shortcut) OVERRIDE; 381 bool* is_keyboard_shortcut) OVERRIDE;
368 virtual void HandleKeyboardEvent( 382 virtual void HandleKeyboardEvent(
369 const content::NativeWebKeyboardEvent& event) OVERRIDE; 383 const content::NativeWebKeyboardEvent& event) OVERRIDE;
370 384
371 // RenderViewHostManager::Delegate ------------------------------------------- 385 // RenderViewHostManager::Delegate -------------------------------------------
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 // Helper classes ------------------------------------------------------------ 615 // Helper classes ------------------------------------------------------------
602 616
603 // Manages creation and swapping of render views. 617 // Manages creation and swapping of render views.
604 RenderViewHostManager render_manager_; 618 RenderViewHostManager render_manager_;
605 619
606 // Manages injecting Java objects into all RenderViewHosts associated with 620 // Manages injecting Java objects into all RenderViewHosts associated with
607 // this WebContentsImpl. 621 // this WebContentsImpl.
608 scoped_ptr<JavaBridgeDispatcherHostManager> 622 scoped_ptr<JavaBridgeDispatcherHostManager>
609 java_bridge_dispatcher_host_manager_; 623 java_bridge_dispatcher_host_manager_;
610 624
625 // Manages the browser plugin instances hosted by this WebContents.
626 scoped_ptr<content::BrowserPluginHost> browser_plugin_host_;
627
611 // SavePackage, lazily created. 628 // SavePackage, lazily created.
612 scoped_refptr<SavePackage> save_package_; 629 scoped_refptr<SavePackage> save_package_;
613 630
614 // Data for loading state ---------------------------------------------------- 631 // Data for loading state ----------------------------------------------------
615 632
616 // Indicates whether we're currently loading a resource. 633 // Indicates whether we're currently loading a resource.
617 bool is_loading_; 634 bool is_loading_;
618 635
619 // Indicates if the tab is considered crashed. 636 // Indicates if the tab is considered crashed.
620 base::TerminationStatus crashed_status_; 637 base::TerminationStatus crashed_status_;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 // Type of view this WebContents is displaying. 740 // Type of view this WebContents is displaying.
724 content::ViewType view_type_; 741 content::ViewType view_type_;
725 742
726 // Color chooser that was opened by this tab. 743 // Color chooser that was opened by this tab.
727 content::ColorChooser* color_chooser_; 744 content::ColorChooser* color_chooser_;
728 745
729 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 746 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
730 }; 747 };
731 748
732 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 749 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698