summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container.cc
diff options
context:
space:
mode:
authorrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 21:10:37 +0000
committerrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 21:10:37 +0000
commit87a22e7b22583637338dbe55398ae6711430437f (patch)
treec95a285a07f1dd4c24e60d31779204262732961f /chrome/browser/external_tab_container.cc
parentf1a8760cc11a49cf1aca88c76712bc2d55a8f5ac (diff)
downloadchromium_src-87a22e7b22583637338dbe55398ae6711430437f.zip
chromium_src-87a22e7b22583637338dbe55398ae6711430437f.tar.gz
chromium_src-87a22e7b22583637338dbe55398ae6711430437f.tar.bz2
Reverting 17223 (http://codereview.chromium.org/115943). Seems to make interactive UI tests unhappy.
TBR=tommi Review URL: http://codereview.chromium.org/118029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.cc')
-rw-r--r--chrome/browser/external_tab_container.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 3a24366..a8490ae 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -130,7 +130,7 @@ void ExternalTabContainer::SetInitialFocus(bool reverse) {
bool ExternalTabContainer::IsExternalTabContainer(HWND window) {
if (GetProp(window, kWindowObjectKey) != NULL)
return true;
-
+
return false;
}
@@ -186,8 +186,7 @@ void ExternalTabContainer::AddNewContents(TabContents* source,
WindowOpenDisposition disposition,
const gfx::Rect& initial_pos,
bool user_gesture) {
- if (disposition == NEW_POPUP || disposition == NEW_WINDOW ||
- disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) {
+ if (disposition == NEW_POPUP || disposition == NEW_WINDOW) {
Browser::BuildPopupWindowHelper(source, new_contents, initial_pos,
Browser::TYPE_POPUP,
tab_contents_->profile(), true);
@@ -236,7 +235,7 @@ void ExternalTabContainer::ToolbarSizeChanged(TabContents* source,
void ExternalTabContainer::ForwardMessageToExternalHost(
const std::string& message, const std::string& origin,
const std::string& target) {
- if (automation_) {
+ if(automation_) {
automation_->Send(
new AutomationMsg_ForwardMessageToExternalHost(0, tab_handle_,
message, origin, target));