| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/task_manager/task_manager_resource_providers.h" | 5 #include "chrome/browser/task_manager/task_manager_resource_providers.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 TaskManagerPanelResource* resource = iter->second; | 742 TaskManagerPanelResource* resource = iter->second; |
| 743 task_manager_->RemoveResource(resource); | 743 task_manager_->RemoveResource(resource); |
| 744 resources_.erase(iter); | 744 resources_.erase(iter); |
| 745 delete resource; | 745 delete resource; |
| 746 } | 746 } |
| 747 | 747 |
| 748 void TaskManagerPanelResourceProvider::Observe(int type, | 748 void TaskManagerPanelResourceProvider::Observe(int type, |
| 749 const content::NotificationSource& source, | 749 const content::NotificationSource& source, |
| 750 const content::NotificationDetails& details) { | 750 const content::NotificationDetails& details) { |
| 751 WebContents* web_contents = content::Source<WebContents>(source).ptr(); | 751 WebContents* web_contents = content::Source<WebContents>(source).ptr(); |
| 752 if (chrome::GetViewType(web_contents) != chrome::VIEW_TYPE_PANEL) | 752 if (chrome::GetViewType(web_contents) != extensions::VIEW_TYPE_PANEL) |
| 753 return; | 753 return; |
| 754 | 754 |
| 755 switch (type) { | 755 switch (type) { |
| 756 case content::NOTIFICATION_WEB_CONTENTS_CONNECTED: | 756 case content::NOTIFICATION_WEB_CONTENTS_CONNECTED: |
| 757 { | 757 { |
| 758 std::vector<Panel*>panels = PanelManager::GetInstance()->panels(); | 758 std::vector<Panel*>panels = PanelManager::GetInstance()->panels(); |
| 759 for (size_t i = 0; i < panels.size(); ++i) { | 759 for (size_t i = 0; i < panels.size(); ++i) { |
| 760 if (panels[i]->GetWebContents() == web_contents) { | 760 if (panels[i]->GetWebContents() == web_contents) { |
| 761 Add(panels[i]); | 761 Add(panels[i]); |
| 762 break; | 762 break; |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1402 Profile* profile = Profile::FromBrowserContext( | 1402 Profile* profile = Profile::FromBrowserContext( |
| 1403 render_view_host_->GetProcess()->GetBrowserContext()); | 1403 render_view_host_->GetProcess()->GetBrowserContext()); |
| 1404 ExtensionProcessManager* process_manager = | 1404 ExtensionProcessManager* process_manager = |
| 1405 extensions::ExtensionSystem::Get(profile)->process_manager(); | 1405 extensions::ExtensionSystem::Get(profile)->process_manager(); |
| 1406 return process_manager->GetExtensionForRenderViewHost(render_view_host_); | 1406 return process_manager->GetExtensionForRenderViewHost(render_view_host_); |
| 1407 } | 1407 } |
| 1408 | 1408 |
| 1409 bool TaskManagerExtensionProcessResource::IsBackground() const { | 1409 bool TaskManagerExtensionProcessResource::IsBackground() const { |
| 1410 WebContents* web_contents = | 1410 WebContents* web_contents = |
| 1411 WebContents::FromRenderViewHost(render_view_host_); | 1411 WebContents::FromRenderViewHost(render_view_host_); |
| 1412 chrome::ViewType view_type = chrome::GetViewType(web_contents); | 1412 extensions::ViewType view_type = chrome::GetViewType(web_contents); |
| 1413 return view_type == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; | 1413 return view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; |
| 1414 } | 1414 } |
| 1415 | 1415 |
| 1416 //////////////////////////////////////////////////////////////////////////////// | 1416 //////////////////////////////////////////////////////////////////////////////// |
| 1417 // TaskManagerExtensionProcessResourceProvider class | 1417 // TaskManagerExtensionProcessResourceProvider class |
| 1418 //////////////////////////////////////////////////////////////////////////////// | 1418 //////////////////////////////////////////////////////////////////////////////// |
| 1419 | 1419 |
| 1420 TaskManagerExtensionProcessResourceProvider:: | 1420 TaskManagerExtensionProcessResourceProvider:: |
| 1421 TaskManagerExtensionProcessResourceProvider(TaskManager* task_manager) | 1421 TaskManagerExtensionProcessResourceProvider(TaskManager* task_manager) |
| 1422 : task_manager_(task_manager), | 1422 : task_manager_(task_manager), |
| 1423 updating_(false) { | 1423 updating_(false) { |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1538 | 1538 |
| 1539 bool TaskManagerExtensionProcessResourceProvider:: | 1539 bool TaskManagerExtensionProcessResourceProvider:: |
| 1540 IsHandledByThisProvider(content::RenderViewHost* render_view_host) { | 1540 IsHandledByThisProvider(content::RenderViewHost* render_view_host) { |
| 1541 WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); | 1541 WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); |
| 1542 // Don't add WebContents that belong to a guest (those are handled by | 1542 // Don't add WebContents that belong to a guest (those are handled by |
| 1543 // TaskManagerGuestResourceProvider). Otherwise they will be added twice, and | 1543 // TaskManagerGuestResourceProvider). Otherwise they will be added twice, and |
| 1544 // in this case they will have the app's name as a title (due to the | 1544 // in this case they will have the app's name as a title (due to the |
| 1545 // TaskManagerExtensionProcessResource constructor). | 1545 // TaskManagerExtensionProcessResource constructor). |
| 1546 if (web_contents->GetRenderProcessHost()->IsGuest()) | 1546 if (web_contents->GetRenderProcessHost()->IsGuest()) |
| 1547 return false; | 1547 return false; |
| 1548 chrome::ViewType view_type = chrome::GetViewType(web_contents); | 1548 extensions::ViewType view_type = chrome::GetViewType(web_contents); |
| 1549 // Don't add WebContents (those are handled by | 1549 // Don't add WebContents (those are handled by |
| 1550 // TaskManagerTabContentsResourceProvider) or background contents (handled | 1550 // TaskManagerTabContentsResourceProvider) or background contents (handled |
| 1551 // by TaskManagerBackgroundResourceProvider). | 1551 // by TaskManagerBackgroundResourceProvider). |
| 1552 #if defined(USE_ASH) | 1552 #if defined(USE_ASH) |
| 1553 return (view_type != chrome::VIEW_TYPE_TAB_CONTENTS && | 1553 return (view_type != extensions::VIEW_TYPE_TAB_CONTENTS && |
| 1554 view_type != chrome::VIEW_TYPE_BACKGROUND_CONTENTS); | 1554 view_type != extensions::VIEW_TYPE_BACKGROUND_CONTENTS); |
| 1555 #else | 1555 #else |
| 1556 return (view_type != chrome::VIEW_TYPE_TAB_CONTENTS && | 1556 return (view_type != extensions::VIEW_TYPE_TAB_CONTENTS && |
| 1557 view_type != chrome::VIEW_TYPE_BACKGROUND_CONTENTS && | 1557 view_type != extensions::VIEW_TYPE_BACKGROUND_CONTENTS && |
| 1558 view_type != chrome::VIEW_TYPE_PANEL); | 1558 view_type != extensions::VIEW_TYPE_PANEL); |
| 1559 #endif // USE_ASH | 1559 #endif // USE_ASH |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 void TaskManagerExtensionProcessResourceProvider::AddToTaskManager( | 1562 void TaskManagerExtensionProcessResourceProvider::AddToTaskManager( |
| 1563 content::RenderViewHost* render_view_host) { | 1563 content::RenderViewHost* render_view_host) { |
| 1564 if (!IsHandledByThisProvider(render_view_host)) | 1564 if (!IsHandledByThisProvider(render_view_host)) |
| 1565 return; | 1565 return; |
| 1566 | 1566 |
| 1567 TaskManagerExtensionProcessResource* resource = | 1567 TaskManagerExtensionProcessResource* resource = |
| 1568 new TaskManagerExtensionProcessResource(render_view_host); | 1568 new TaskManagerExtensionProcessResource(render_view_host); |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1896 case content::NOTIFICATION_WEB_CONTENTS_CONNECTED: | 1896 case content::NOTIFICATION_WEB_CONTENTS_CONNECTED: |
| 1897 Add(web_contents->GetRenderViewHost()); | 1897 Add(web_contents->GetRenderViewHost()); |
| 1898 break; | 1898 break; |
| 1899 case content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED: | 1899 case content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED: |
| 1900 Remove(web_contents->GetRenderViewHost()); | 1900 Remove(web_contents->GetRenderViewHost()); |
| 1901 break; | 1901 break; |
| 1902 default: | 1902 default: |
| 1903 NOTREACHED() << "Unexpected notification."; | 1903 NOTREACHED() << "Unexpected notification."; |
| 1904 } | 1904 } |
| 1905 } | 1905 } |
| OLD | NEW |