diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 15:44:59 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 15:44:59 +0000 |
| commit | f32c7f0bbaae5198442a621100161efd0e9fdb99 (patch) | |
| tree | f30862eb3dd6cd361950b97183f5c64a7221b214 /chrome/browser/tab_contents | |
| parent | df51a04a0d9121552b5f6f34bea90a681d47639a (diff) | |
| download | chromium_src-f32c7f0bbaae5198442a621100161efd0e9fdb99.zip chromium_src-f32c7f0bbaae5198442a621100161efd0e9fdb99.tar.gz chromium_src-f32c7f0bbaae5198442a621100161efd0e9fdb99.tar.bz2 | |
Porting in chrome/browser/
Review URL: http://codereview.chromium.org/17606
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
4 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index ca0f226..491b1cc 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -17,12 +17,6 @@ #include "chrome/views/window_delegate.h" #include "net/base/escape.h" -enum ResourceRequestAction { - BLOCK, - RESUME, - CANCEL -}; - namespace { class ResourceRequestTask : public Task { diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h index e740fea..9a68f95 100644 --- a/chrome/browser/tab_contents/interstitial_page.h +++ b/chrome/browser/tab_contents/interstitial_page.h @@ -26,7 +26,11 @@ class WebContents; // through a navigation, the WebContents closing them or the tab containing them // being closed. -enum ResourceRequestAction; +enum ResourceRequestAction { + BLOCK, + RESUME, + CANCEL +}; class InterstitialPage : public NotificationObserver, public RenderViewHostDelegate { diff --git a/chrome/browser/tab_contents/ipc_status_view.cc b/chrome/browser/tab_contents/ipc_status_view.cc index 1385898..cd85ee0 100644 --- a/chrome/browser/tab_contents/ipc_status_view.cc +++ b/chrome/browser/tab_contents/ipc_status_view.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" +#include "chrome/browser/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/ipc_logging.h" #include "chrome/common/plugin_messages.h" diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h index 14cf5b0..ab76e7a 100644 --- a/chrome/browser/tab_contents/navigation_controller.h +++ b/chrome/browser/tab_contents/navigation_controller.h @@ -11,13 +11,13 @@ #include "base/ref_counted.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ssl/ssl_manager.h" -#include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/tab_contents/tab_contents_type.h" #include "chrome/common/navigation_types.h" class GURL; class Profile; class TabContents; +class SiteInstance; class WebContents; class TabContentsCollector; class TabNavigation; |