diff options
| -rw-r--r-- | chrome/browser/browser.scons | 1 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.h | 6 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_manager.h | 11 | ||||
| -rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 846cae1..d5ba3c7 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -784,7 +784,6 @@ if not env.Bit('windows'): 'tab_contents/network_status_view.cc', 'tab_contents/render_view_context_menu.cc', 'tab_contents/render_view_context_menu_controller.cc', - 'tab_contents/render_view_host_manager.cc', 'tab_contents/status_view.cc', 'tab_contents/tab_contents.cc', 'tab_contents/tab_contents_factory.cc', diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 19bb424..ea44f01 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -16,10 +16,11 @@ #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #endif -#include "webkit/glue/password_form_dom_manager.h" #include "webkit/glue/autofill_form.h" +#include "webkit/glue/console_message_level.h" +#include "webkit/glue/password_form_dom_manager.h" +#include "webkit/glue/window_open_disposition.h" -enum ConsoleMessageLevel; class NavigationEntry; class RenderViewHostDelegate; class SiteInstance; @@ -32,7 +33,6 @@ struct ViewMsg_Print_Params; struct ViewMsg_PrintPages_Params; struct WebDropData; struct WebPreferences; -enum WindowOpenDisposition; namespace base { class WaitableEvent; diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h index 29a9f8f..3522b40 100644 --- a/chrome/browser/tab_contents/render_view_host_manager.h +++ b/chrome/browser/tab_contents/render_view_host_manager.h @@ -5,10 +5,6 @@ #ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ -#include <windows.h> - -#include <string> - #include "base/basictypes.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -198,6 +194,9 @@ class RenderViewHostManager { // Our delegate, not owned by us. Guaranteed non-NULL. Delegate* delegate_; + // Whether a cross-site request is pending (in the new process model). + bool cross_navigation_pending_; + // Allows tests to create their own render view host types. RenderViewHostFactory* render_view_factory_; @@ -217,9 +216,6 @@ class RenderViewHostManager { // (the InterstitialPage is self-owned, it deletes itself when hidden). InterstitialPage* interstitial_page_; - // Whether a cross-site request is pending (in the new process model). - bool cross_navigation_pending_; - DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager); }; @@ -231,4 +227,3 @@ struct RenderViewHostSwitchedDetails { }; #endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ - diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index ca1ed1d..2f4d201 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -232,6 +232,7 @@ 826858FA0F326FA3009F6555 /* testing_profile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 826858F80F326FA3009F6555 /* testing_profile.cc */; }; 8570EB3F140C07ABF1957F12 /* url_pattern_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A9C335E39D39A7DE087850FC /* url_pattern_unittest.cc */; }; 8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 778D7927798B7E3FAA498D3D /* url_fetcher.cc */; }; + 94542322A5E5A8F4FDDAB7F0 /* render_view_host_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = A76E42AD0F28EDB5009A7E88 /* render_view_host_manager.cc */; }; A54612DC0EE9958600A8EE5D /* extensions_service_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A54612DB0EE9958600A8EE5D /* extensions_service_unittest.cc */; }; A54612E20EE995F600A8EE5D /* extensions_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = A54612D90EE9957000A8EE5D /* extensions_service.cc */; }; A572828F0F31156100384E1B /* unzip_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45076E80F153B06003BE099 /* unzip_unittest.cc */; }; @@ -4594,6 +4595,7 @@ E4F324500EE5CF7C002533CE /* query_parser.cc in Sources */, E4F3247A0EE5D17E002533CE /* referrer.cc in Sources */, A7C612990F30D63D008CEE5D /* render_process_host.cc in Sources */, + 94542322A5E5A8F4FDDAB7F0 /* render_view_host_manager.cc in Sources */, E434BBBF0F37D6DB00B665C7 /* render_widget_helper.cc in Sources */, E434BBEB0F37DFA500B665C7 /* renderer_security_policy.cc in Sources */, 4D7BFAF30E9D49EF009A6919 /* safe_browsing_database.cc in Sources */, |