| Index: chrome/browser/extensions/extension_tabs_module.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_tabs_module.cc (revision 26435)
|
| +++ chrome/browser/extensions/extension_tabs_module.cc (working copy)
|
| @@ -27,7 +27,6 @@
|
| #include "skia/ext/platform_canvas.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| -
|
| namespace keys = extension_tabs_module_constants;
|
|
|
| // Forward declare static helper functions defined below.
|
| @@ -157,6 +156,22 @@
|
| return result;
|
| }
|
|
|
| +bool ExtensionTabUtil::GetDefaultTab(Browser* browser, TabContents** contents,
|
| + int* tab_id) {
|
| + DCHECK(browser);
|
| + DCHECK(contents);
|
| + DCHECK(tab_id);
|
| +
|
| + *contents = browser->tabstrip_model()->GetSelectedTabContents();
|
| + if (*contents) {
|
| + if (tab_id)
|
| + *tab_id = ExtensionTabUtil::GetTabId(*contents);
|
| + return true;
|
| + }
|
| +
|
| + return false;
|
| +}
|
| +
|
| bool ExtensionTabUtil::GetTabById(int tab_id, Profile* profile,
|
| Browser** browser,
|
| TabStripModel** tab_strip,
|
| @@ -676,7 +691,7 @@
|
|
|
| if (new_index != tab_index)
|
| source_tab_strip->MoveTabContentsAt(tab_index, new_index, false);
|
| -
|
| +
|
| if (has_callback())
|
| result_.reset(ExtensionTabUtil::CreateTabValue(contents, source_tab_strip,
|
| new_index));
|
|
|