| Index: chrome/browser/extensions/extension_tab_util.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_tab_util.cc (revision 246091)
|
| +++ chrome/browser/extensions/extension_tab_util.cc (working copy)
|
| @@ -52,8 +52,8 @@
|
| registry->GetShellWindowForRenderViewHost(contents->GetRenderViewHost());
|
| if (!shell_window)
|
| return NULL;
|
| - return WindowControllerList::GetInstance()->
|
| - FindWindowById(shell_window->session_id().id());
|
| + return WindowControllerList::GetInstance()->FindWindowById(
|
| + shell_window->session_id().id());
|
| }
|
|
|
| } // namespace
|
| @@ -95,7 +95,7 @@
|
| (!extension || controller->IsVisibleToExtension(extension))) {
|
| return controller->CreateTabValue(extension, tab_index);
|
| }
|
| - base::DictionaryValue *result =
|
| + base::DictionaryValue* result =
|
| CreateTabValue(contents, tab_strip, tab_index);
|
| ScrubTabValueForExtension(contents, extension, result);
|
| return result;
|
| @@ -169,6 +169,14 @@
|
| return result;
|
| }
|
|
|
| +base::DictionaryValue* ExtensionTabUtil::CreateTabValueForPlatformApp(
|
| + const WebContents* contents) {
|
| + base::DictionaryValue* result = new base::DictionaryValue();
|
| + result->SetInteger(keys::kIdKey, GetTabId(contents));
|
| + result->SetBoolean("isPlatformApp", true);
|
| + return result;
|
| +}
|
| +
|
| void ExtensionTabUtil::ScrubTabValueForExtension(
|
| const WebContents* contents,
|
| const Extension* extension,
|
|
|