diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 18:40:01 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 18:40:01 +0000 |
| commit | cccd376dcdb2cc8855c7ca1fd649a948d68d6f08 (patch) | |
| tree | 5b7dc1ac2b4ae5f67130558958d43eb72070425a /chrome/test/automation | |
| parent | d344a107c64835954d494f2e4477c7326c31abd8 (diff) | |
| download | chromium_src-cccd376dcdb2cc8855c7ca1fd649a948d68d6f08.zip chromium_src-cccd376dcdb2cc8855c7ca1fd649a948d68d6f08.tar.gz chromium_src-cccd376dcdb2cc8855c7ca1fd649a948d68d6f08.tar.bz2 | |
Part 3 of reapplying r64637.
This moves SecurityStyle and PageType into chrome/common/ and removes the
chrome_frame dependency on chrome/browser/tab_contents/. This undoes the
temporary DEPS hack on chrome/common/.
BUG=51409
TEST=compiles
Review URL: http://codereview.chromium.org/4697005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
| -rw-r--r-- | chrome/test/automation/tab_proxy.cc | 2 | ||||
| -rw-r--r-- | chrome/test/automation/tab_proxy.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index d7c99dd..fbd837c 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -605,7 +605,7 @@ bool TabProxy::GetSecurityState(SecurityStyle* security_style, return succeeded; } -bool TabProxy::GetPageType(NavigationEntry::PageType* type) { +bool TabProxy::GetPageType(PageType* type) { DCHECK(type); if (!is_valid()) diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index 217863c..c4b1ee7 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -18,9 +18,9 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" #include "chrome/browser/download/save_package.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/security_style.h" #include "chrome/common/automation_constants.h" +#include "chrome/common/page_type.h" +#include "chrome/common/security_style.h" #include "chrome/test/automation/automation_handle_tracker.h" #include "chrome/test/automation/dom_element_proxy.h" #include "chrome/test/automation/javascript_execution_controller.h" @@ -323,7 +323,7 @@ class TabProxy : public AutomationResourceProxy, // Returns the type of the page currently showing (normal, interstitial, // error). - bool GetPageType(NavigationEntry::PageType* page_type) WARN_UNUSED_RESULT; + bool GetPageType(PageType* page_type) WARN_UNUSED_RESULT; // Simulates the user action on the SSL blocking page. if |proceed| is true, // this is equivalent to clicking the 'Proceed' button, if false to 'Take me |