Chromium Code Reviews| Index: chrome/browser/extensions/extension_tab_util.cc |
| diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc |
| index 68d6fe0f98a1331832d37f37e2582ec49485859e..b6f367b428070dc21e2fedda04243ee426d0598e 100644 |
| --- a/chrome/browser/extensions/extension_tab_util.cc |
| +++ b/chrome/browser/extensions/extension_tab_util.cc |
| @@ -10,12 +10,14 @@ |
| #include "base/strings/string_number_conversions.h" |
| #include "base/strings/stringprintf.h" |
| #include "base/strings/utf_string_conversions.h" |
| +#include "chrome/browser/browser_process.h" |
| #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| #include "chrome/browser/extensions/chrome_extension_function.h" |
| #include "chrome/browser/extensions/chrome_extension_function_details.h" |
| #include "chrome/browser/extensions/tab_helper.h" |
| #include "chrome/browser/extensions/window_controller.h" |
| #include "chrome/browser/extensions/window_controller_list.h" |
| +#include "chrome/browser/memory/tab_manager.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/sessions/session_tab_helper.h" |
| #include "chrome/browser/ui/browser.h" |
| @@ -388,6 +390,11 @@ std::unique_ptr<api::tabs::Tab> ExtensionTabUtil::CreateTabObject( |
| tab_object->highlighted = tab_strip && tab_strip->IsTabSelected(tab_index); |
| tab_object->pinned = tab_strip && tab_strip->IsTabPinned(tab_index); |
| tab_object->audible.reset(new bool(contents->WasRecentlyAudible())); |
| + |
| + memory::TabManager* tab_manager = |
| + g_browser_process ? g_browser_process->GetTabManager() : nullptr; |
|
chrisha
2016/06/15 15:56:12
Can g_browser_process every not exist in this cont
Georges Khalil
2016/06/15 17:25:42
Looking at similar code, we can even forgo the DCH
Anderson Silva
2016/06/16 14:04:51
Acknowledged.
|
| + tab_object->discarded = tab_manager && tab_manager->IsTabDiscarded(contents); |
| + |
| tab_object->muted_info = CreateMutedInfo(contents); |
| tab_object->incognito = contents->GetBrowserContext()->IsOffTheRecord(); |
| tab_object->width.reset( |