| Index: chrome/browser/extensions/extension_tabs_module.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_tabs_module.cc (revision 116288)
|
| +++ chrome/browser/extensions/extension_tabs_module.cc (working copy)
|
| @@ -61,6 +61,7 @@
|
| namespace keys = extension_tabs_module_constants;
|
| namespace errors = extension_manifest_errors;
|
|
|
| +using content::NavigationController;
|
| using content::NavigationEntry;
|
| using content::OpenURLParams;
|
| using content::Referrer;
|
| @@ -1072,8 +1073,7 @@
|
| NULL, &tab_strip, &contents, &tab_index, &error_)) {
|
| return false;
|
| }
|
| - content::NavigationController& controller =
|
| - contents->web_contents()->GetController();
|
| + NavigationController& controller = contents->web_contents()->GetController();
|
|
|
| // TODO(rafaelw): handle setting remaining tab properties:
|
| // -title
|
| @@ -1639,11 +1639,11 @@
|
| content::Source<WebContents>(contents->web_contents()));
|
| registrar_.Add(
|
| this, content::NOTIFICATION_TAB_CLOSING,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &(contents->web_contents()->GetController())));
|
| registrar_.Add(
|
| this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
|
| - content::Source<content::NavigationController>(
|
| + content::Source<NavigationController>(
|
| &(contents->web_contents()->GetController())));
|
| return true;
|
| }
|
|
|