diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 23:33:39 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 23:33:39 +0000 |
| commit | 5b0ce253b1728530edebbedfb9608a6f479545d9 (patch) | |
| tree | ba117f719cc5babe4ca392add95c9a1df0dad4bd /chrome/browser/extensions/extension_dom_ui.cc | |
| parent | 5e5f41aed47d97e89623075b4caf2071bc9950cc (diff) | |
| download | chromium_src-5b0ce253b1728530edebbedfb9608a6f479545d9.zip chromium_src-5b0ce253b1728530edebbedfb9608a6f479545d9.tar.gz chromium_src-5b0ce253b1728530edebbedfb9608a6f479545d9.tar.bz2 | |
Merge branch 'api' of /src/chrome/src into api
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_dom_ui.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_dom_ui.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index 044a28a..c3741c7 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -40,7 +40,7 @@ void ExtensionDOMUI::ResetExtensionFunctionDispatcher( // Use the NavigationController to get the URL rather than the TabContents // since this is the real underlying URL (see HandleChromeURLOverride). NavigationController& controller = tab_contents()->controller(); - const GURL& url = controller.pending_entry()->url(); + const GURL& url = controller.GetActiveEntry()->url(); extension_function_dispatcher_.reset( new ExtensionFunctionDispatcher(render_view_host, this, url)); } |