summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 18:47:49 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 18:47:49 +0000
commit24f98bbac219f4fe06cf445b36b17cd35a74c66f (patch)
treecdfd3751925bb7b9cbf4068596643310a1bd2f24 /chrome/browser/external_tab_container.h
parenta5d0f4bc0d2891cc7fa372d245ebf46332259d7d (diff)
downloadchromium_src-24f98bbac219f4fe06cf445b36b17cd35a74c66f.zip
chromium_src-24f98bbac219f4fe06cf445b36b17cd35a74c66f.tar.gz
chromium_src-24f98bbac219f4fe06cf445b36b17cd35a74c66f.tar.bz2
Ensure that the correct URL and title is displayed in the host browser if the browser tab
is attached to an existing external tab. This can happen if a script running in chrome invokes window.open which opens a popup window. To ensure that the title and URL display correctly we send over the navigation state changed IPC from Chrome when we receive an IPC from ChromeFrame indicating that it connected to the external tab. I also made a change to the function which sends over the navigation state to chrome to ensure that we set the title to the URL if it is empty. This mimics Chrome and the other browser's behavior. This should fix http://code.google.com/p/chromium/issues/detail?id=24024 Bug=24024 Review URL: http://codereview.chromium.org/274035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.h')
-rw-r--r--chrome/browser/external_tab_container.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h
index 1438f5d..879a147 100644
--- a/chrome/browser/external_tab_container.h
+++ b/chrome/browser/external_tab_container.h
@@ -210,6 +210,10 @@ class ExternalTabContainer : public TabContentsDelegate,
// Contains ExternalTabContainers that have not been connected to as yet.
static PendingTabs pending_tabs_;
+ // Allows us to run tasks on the ExternalTabContainer instance which are
+ // bound by its lifetime.
+ ScopedRunnableMethodFactory<ExternalTabContainer> external_method_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer);
};