| Index: chrome/browser/tab_contents/tab_contents.cc
|
| ===================================================================
|
| --- chrome/browser/tab_contents/tab_contents.cc (revision 19909)
|
| +++ chrome/browser/tab_contents/tab_contents.cc (working copy)
|
| @@ -50,6 +50,7 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/pref_service.h"
|
| #include "chrome/common/render_messages.h"
|
| +#include "chrome/common/renderer_preferences.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| @@ -57,6 +58,8 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_util.h"
|
| #include "net/base/registry_controlled_domain.h"
|
| +#include "webkit/glue/password_form.h"
|
| +#include "webkit/glue/webpreferences.h"
|
|
|
| #if defined(OS_WIN)
|
| // For CRect
|
| @@ -2139,6 +2142,10 @@
|
| new_request_id);
|
| }
|
|
|
| +void TabContents::OnCrossSiteNavigationCanceled() {
|
| + render_manager_.CrossSiteNavigationCanceled();
|
| +}
|
| +
|
| bool TabContents::CanBlur() const {
|
| return delegate() ? delegate()->CanBlur() : true;
|
| }
|
| @@ -2211,6 +2218,13 @@
|
| controller_.OnUserGesture();
|
| }
|
|
|
| +bool TabContents::IsExternalTabContainer() const {
|
| + if (!delegate())
|
| + return false;
|
| +
|
| + return delegate()->IsExternalTabContainer();
|
| +}
|
| +
|
| void TabContents::OnFindReply(int request_id,
|
| int number_of_matches,
|
| const gfx::Rect& selection_rect,
|
| @@ -2242,11 +2256,8 @@
|
| Details<FindNotificationDetails>(&last_search_result_));
|
| }
|
|
|
| -bool TabContents::IsExternalTabContainer() const {
|
| - if (!delegate())
|
| - return false;
|
| -
|
| - return delegate()->IsExternalTabContainer();
|
| +void TabContents::DidInsertCSS() {
|
| + // This RVHDelegate function is used for extensions and not us.
|
| }
|
|
|
| void TabContents::FileSelected(const FilePath& path,
|
|
|