Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: chrome/browser/ui/task_manager/task_manager_table_model.cc

Issue 2646623004: Query NaCl processes' GDB debug port on the correct thread. (Closed)
Patch Set: Fix GetNaClPortText() expectation and rename new_visibility Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/ui/task_manager/task_manager_table_model.h" 5 #include "chrome/browser/ui/task_manager/task_manager_table_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 } 184 }
185 185
186 base::string16 GetIdleWakeupsText(int idle_wakeups) { 186 base::string16 GetIdleWakeupsText(int idle_wakeups) {
187 if (idle_wakeups == -1) 187 if (idle_wakeups == -1)
188 return n_a_string_; 188 return n_a_string_;
189 189
190 return base::FormatNumber(idle_wakeups); 190 return base::FormatNumber(idle_wakeups);
191 } 191 }
192 192
193 base::string16 GetNaClPortText(int nacl_port) { 193 base::string16 GetNaClPortText(int nacl_port) {
194 if (nacl_port == nacl::kGdbDebugStubPortUnused || nacl_port == -2) 194 // Only called if NaCl debug stub ports are enabled.
195
196 if (nacl_port == nacl::kGdbDebugStubPortUnused)
195 return n_a_string_; 197 return n_a_string_;
196 198
197 if (nacl_port == nacl::kGdbDebugStubPortUnknown) 199 if (nacl_port == nacl::kGdbDebugStubPortUnknown)
198 return unknown_string_; 200 return unknown_string_;
199 201
200 return base::IntToString16(nacl_port); 202 return base::IntToString16(nacl_port);
201 } 203 }
202 204
203 base::string16 GetWindowsHandlesText(int64_t current, int64_t peak) { 205 base::string16 GetWindowsHandlesText(int64_t current, int64_t peak) {
204 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_HANDLES_CELL_TEXT, 206 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_HANDLES_CELL_TEXT,
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 678
677 void TaskManagerTableModel::ActivateTask(int row_index) { 679 void TaskManagerTableModel::ActivateTask(int row_index) {
678 observed_task_manager()->ActivateTask(tasks_[row_index]); 680 observed_task_manager()->ActivateTask(tasks_[row_index]);
679 } 681 }
680 682
681 void TaskManagerTableModel::KillTask(int row_index) { 683 void TaskManagerTableModel::KillTask(int row_index) {
682 observed_task_manager()->KillTask(tasks_[row_index]); 684 observed_task_manager()->KillTask(tasks_[row_index]);
683 } 685 }
684 686
685 void TaskManagerTableModel::UpdateRefreshTypes(int column_id, bool visibility) { 687 void TaskManagerTableModel::UpdateRefreshTypes(int column_id, bool visibility) {
686 bool new_visibility = visibility; 688 bool needs_refresh = visibility;
Wez 2017/01/23 19:21:02 I update this method not to bother enabling NaCl r
afakhry 2017/02/09 01:26:59 Check out the users of c/b/task_manager/task_manag
Wez 2017/02/10 02:51:56 Acknowledged.
687 RefreshType type = REFRESH_TYPE_NONE; 689 RefreshType type = REFRESH_TYPE_NONE;
688 switch (column_id) { 690 switch (column_id) {
689 case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN: 691 case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN:
690 case IDS_TASK_MANAGER_TASK_COLUMN: 692 case IDS_TASK_MANAGER_TASK_COLUMN:
691 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN: 693 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
692 return; // The data in these columns do not change. 694 return; // The data in these columns do not change.
693 695
694 case IDS_TASK_MANAGER_NET_COLUMN: 696 case IDS_TASK_MANAGER_NET_COLUMN:
695 type = REFRESH_TYPE_NETWORK_USAGE; 697 type = REFRESH_TYPE_NETWORK_USAGE;
696 break; 698 break;
(...skipping 17 matching lines...) Expand all
714 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: 716 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:
715 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: 717 case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
716 case IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN: 718 case IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN:
717 type = REFRESH_TYPE_MEMORY_DETAILS; 719 type = REFRESH_TYPE_MEMORY_DETAILS;
718 if (table_view_delegate_->IsColumnVisible( 720 if (table_view_delegate_->IsColumnVisible(
719 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) || 721 IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN) ||
720 table_view_delegate_->IsColumnVisible( 722 table_view_delegate_->IsColumnVisible(
721 IDS_TASK_MANAGER_SHARED_MEM_COLUMN) || 723 IDS_TASK_MANAGER_SHARED_MEM_COLUMN) ||
722 table_view_delegate_->IsColumnVisible( 724 table_view_delegate_->IsColumnVisible(
723 IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN)) { 725 IDS_TASK_MANAGER_SWAPPED_MEM_COLUMN)) {
724 new_visibility = true; 726 needs_refresh = true;
725 } 727 }
726 break; 728 break;
727 729
728 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN: 730 case IDS_TASK_MANAGER_GDI_HANDLES_COLUMN:
729 case IDS_TASK_MANAGER_USER_HANDLES_COLUMN: 731 case IDS_TASK_MANAGER_USER_HANDLES_COLUMN:
730 type = REFRESH_TYPE_HANDLES; 732 type = REFRESH_TYPE_HANDLES;
731 if (table_view_delegate_->IsColumnVisible( 733 if (table_view_delegate_->IsColumnVisible(
732 IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) || 734 IDS_TASK_MANAGER_GDI_HANDLES_COLUMN) ||
733 table_view_delegate_->IsColumnVisible( 735 table_view_delegate_->IsColumnVisible(
734 IDS_TASK_MANAGER_USER_HANDLES_COLUMN)) { 736 IDS_TASK_MANAGER_USER_HANDLES_COLUMN)) {
735 new_visibility = true; 737 needs_refresh = true;
736 } 738 }
737 break; 739 break;
738 740
739 case IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN: 741 case IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN:
740 type = REFRESH_TYPE_IDLE_WAKEUPS; 742 type = REFRESH_TYPE_IDLE_WAKEUPS;
741 break; 743 break;
742 744
743 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: 745 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
744 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN: 746 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:
745 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: 747 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:
746 type = REFRESH_TYPE_WEBCACHE_STATS; 748 type = REFRESH_TYPE_WEBCACHE_STATS;
747 if (table_view_delegate_->IsColumnVisible( 749 if (table_view_delegate_->IsColumnVisible(
748 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) || 750 IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN) ||
749 table_view_delegate_->IsColumnVisible( 751 table_view_delegate_->IsColumnVisible(
750 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) || 752 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN) ||
751 table_view_delegate_->IsColumnVisible( 753 table_view_delegate_->IsColumnVisible(
752 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN)) { 754 IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN)) {
753 new_visibility = true; 755 needs_refresh = true;
754 } 756 }
755 break; 757 break;
756 758
757 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN: 759 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN:
758 type = REFRESH_TYPE_GPU_MEMORY; 760 type = REFRESH_TYPE_GPU_MEMORY;
759 break; 761 break;
760 762
761 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: 763 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN:
762 type = REFRESH_TYPE_SQLITE_MEMORY; 764 type = REFRESH_TYPE_SQLITE_MEMORY;
763 break; 765 break;
764 766
765 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: 767 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
766 type = REFRESH_TYPE_V8_MEMORY; 768 type = REFRESH_TYPE_V8_MEMORY;
767 break; 769 break;
768 770
769 case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN: 771 case IDS_TASK_MANAGER_NACL_DEBUG_STUB_PORT_COLUMN:
770 type = REFRESH_TYPE_NACL; 772 type = REFRESH_TYPE_NACL;
773 needs_refresh = needs_refresh && is_nacl_debugging_flag_enabled_;
771 break; 774 break;
772 775
773 case IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN: 776 case IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN:
774 type = REFRESH_TYPE_PRIORITY; 777 type = REFRESH_TYPE_PRIORITY;
775 break; 778 break;
776 779
777 case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: 780 case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN:
778 type = REFRESH_TYPE_MEMORY_STATE; 781 type = REFRESH_TYPE_MEMORY_STATE;
779 break; 782 break;
780 783
781 #if defined(OS_LINUX) 784 #if defined(OS_LINUX)
782 case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: 785 case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
783 type = REFRESH_TYPE_FD_COUNT; 786 type = REFRESH_TYPE_FD_COUNT;
784 break; 787 break;
785 #endif // defined(OS_LINUX) 788 #endif // defined(OS_LINUX)
786 789
787 default: 790 default:
788 NOTREACHED(); 791 NOTREACHED();
789 return; 792 return;
790 } 793 }
791 794
792 if (new_visibility) 795 if (needs_refresh)
793 AddRefreshType(type); 796 AddRefreshType(type);
794 else 797 else
795 RemoveRefreshType(type); 798 RemoveRefreshType(type);
796 } 799 }
797 800
798 bool TaskManagerTableModel::IsTaskKillable(int row_index) const { 801 bool TaskManagerTableModel::IsTaskKillable(int row_index) const {
799 return observed_task_manager()->IsTaskKillable(tasks_[row_index]); 802 return observed_task_manager()->IsTaskKillable(tasks_[row_index]);
800 } 803 }
801 804
802 void TaskManagerTableModel::RetrieveSavedColumnsSettingsAndUpdateTable() { 805 void TaskManagerTableModel::RetrieveSavedColumnsSettingsAndUpdateTable() {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 914
912 bool TaskManagerTableModel::IsTaskFirstInGroup(int row_index) const { 915 bool TaskManagerTableModel::IsTaskFirstInGroup(int row_index) const {
913 if (row_index == 0) 916 if (row_index == 0)
914 return true; 917 return true;
915 918
916 return observed_task_manager()->GetProcessId(tasks_[row_index - 1]) != 919 return observed_task_manager()->GetProcessId(tasks_[row_index - 1]) !=
917 observed_task_manager()->GetProcessId(tasks_[row_index]); 920 observed_task_manager()->GetProcessId(tasks_[row_index]);
918 } 921 }
919 922
920 } // namespace task_manager 923 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698