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

Side by Side Diff: chrome/browser/ui/gtk/task_manager_gtk.cc

Issue 10854076: Add GPU memory tab to the task manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/ui/gtk/task_manager_gtk.h" 5 #include "chrome/browser/ui/gtk/task_manager_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 kTaskManagerProfileName, 60 kTaskManagerProfileName,
61 kTaskManagerSharedMem, 61 kTaskManagerSharedMem,
62 kTaskManagerPrivateMem, 62 kTaskManagerPrivateMem,
63 kTaskManagerCPU, 63 kTaskManagerCPU,
64 kTaskManagerNetwork, 64 kTaskManagerNetwork,
65 kTaskManagerProcessID, 65 kTaskManagerProcessID,
66 kTaskManagerJavaScriptMemory, 66 kTaskManagerJavaScriptMemory,
67 kTaskManagerWebCoreImageCache, 67 kTaskManagerWebCoreImageCache,
68 kTaskManagerWebCoreScriptsCache, 68 kTaskManagerWebCoreScriptsCache,
69 kTaskManagerWebCoreCssCache, 69 kTaskManagerWebCoreCssCache,
70 kTaskManagerVideoMemory,
70 kTaskManagerFPS, 71 kTaskManagerFPS,
71 kTaskManagerSqliteMemoryUsed, 72 kTaskManagerSqliteMemoryUsed,
72 kTaskManagerGoatsTeleported, 73 kTaskManagerGoatsTeleported,
73 // Columns below this point are not visible in the task manager. 74 // Columns below this point are not visible in the task manager.
74 kTaskManagerBackgroundColor, 75 kTaskManagerBackgroundColor,
75 kTaskManagerColumnCount, 76 kTaskManagerColumnCount,
76 }; 77 };
77 78
78 const TaskManagerColumn kTaskManagerLastVisibleColumn = 79 const TaskManagerColumn kTaskManagerLastVisibleColumn =
79 kTaskManagerGoatsTeleported; 80 kTaskManagerGoatsTeleported;
(...skipping 17 matching lines...) Expand all
97 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN: 98 case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
98 return kTaskManagerProcessID; 99 return kTaskManagerProcessID;
99 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: 100 case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
100 return kTaskManagerJavaScriptMemory; 101 return kTaskManagerJavaScriptMemory;
101 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: 102 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
102 return kTaskManagerWebCoreImageCache; 103 return kTaskManagerWebCoreImageCache;
103 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN: 104 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:
104 return kTaskManagerWebCoreScriptsCache; 105 return kTaskManagerWebCoreScriptsCache;
105 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: 106 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:
106 return kTaskManagerWebCoreCssCache; 107 return kTaskManagerWebCoreCssCache;
108 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN:
109 return kTaskManagerVideoMemory;
107 case IDS_TASK_MANAGER_FPS_COLUMN: 110 case IDS_TASK_MANAGER_FPS_COLUMN:
108 return kTaskManagerFPS; 111 return kTaskManagerFPS;
109 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: 112 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN:
110 return kTaskManagerSqliteMemoryUsed; 113 return kTaskManagerSqliteMemoryUsed;
111 case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN: 114 case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:
112 return kTaskManagerGoatsTeleported; 115 return kTaskManagerGoatsTeleported;
113 default: 116 default:
114 NOTREACHED(); 117 NOTREACHED();
115 return static_cast<TaskManagerColumn>(-1); 118 return static_cast<TaskManagerColumn>(-1);
116 } 119 }
(...skipping 16 matching lines...) Expand all
133 case kTaskManagerProcessID: 136 case kTaskManagerProcessID:
134 return IDS_TASK_MANAGER_PROCESS_ID_COLUMN; 137 return IDS_TASK_MANAGER_PROCESS_ID_COLUMN;
135 case kTaskManagerJavaScriptMemory: 138 case kTaskManagerJavaScriptMemory:
136 return IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN; 139 return IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN;
137 case kTaskManagerWebCoreImageCache: 140 case kTaskManagerWebCoreImageCache:
138 return IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN; 141 return IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN;
139 case kTaskManagerWebCoreScriptsCache: 142 case kTaskManagerWebCoreScriptsCache:
140 return IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN; 143 return IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN;
141 case kTaskManagerWebCoreCssCache: 144 case kTaskManagerWebCoreCssCache:
142 return IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN; 145 return IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN;
146 case kTaskManagerVideoMemory:
147 return IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN;
143 case kTaskManagerFPS: 148 case kTaskManagerFPS:
144 return IDS_TASK_MANAGER_FPS_COLUMN; 149 return IDS_TASK_MANAGER_FPS_COLUMN;
145 case kTaskManagerSqliteMemoryUsed: 150 case kTaskManagerSqliteMemoryUsed:
146 return IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN; 151 return IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN;
147 case kTaskManagerGoatsTeleported: 152 case kTaskManagerGoatsTeleported:
148 return IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN; 153 return IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN;
149 default: 154 default:
150 NOTREACHED(); 155 NOTREACHED();
151 return -1; 156 return -1;
152 } 157 }
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 gtk_accel_group_connect(accel_group_, 577 gtk_accel_group_connect(accel_group_,
573 GDK_w, GDK_CONTROL_MASK, GtkAccelFlags(0), 578 GDK_w, GDK_CONTROL_MASK, GtkAccelFlags(0),
574 g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), 579 g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk),
575 this, NULL)); 580 this, NULL));
576 } 581 }
577 582
578 void TaskManagerGtk::CreateTaskManagerTreeview() { 583 void TaskManagerGtk::CreateTaskManagerTreeview() {
579 process_list_ = gtk_list_store_new(kTaskManagerColumnCount, 584 process_list_ = gtk_list_store_new(kTaskManagerColumnCount,
580 GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 585 GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
581 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 586 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
582 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 587 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
583 G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_COLOR); 588 G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_COLOR);
584 589
585 // Support sorting on all columns. 590 // Support sorting on all columns.
586 process_list_sort_ = gtk_tree_model_sort_new_with_model( 591 process_list_sort_ = gtk_tree_model_sort_new_with_model(
587 GTK_TREE_MODEL(process_list_)); 592 GTK_TREE_MODEL(process_list_));
588 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 593 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
589 kTaskManagerTask, 594 kTaskManagerTask,
590 ComparePage, this, NULL); 595 ComparePage, this, NULL);
591 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 596 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
592 kTaskManagerTask, 597 kTaskManagerTask,
(...skipping 19 matching lines...) Expand all
612 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 617 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
613 kTaskManagerWebCoreImageCache, 618 kTaskManagerWebCoreImageCache,
614 CompareWebCoreImageCache, this, NULL); 619 CompareWebCoreImageCache, this, NULL);
615 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 620 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
616 kTaskManagerWebCoreScriptsCache, 621 kTaskManagerWebCoreScriptsCache,
617 CompareWebCoreScriptsCache, this, NULL); 622 CompareWebCoreScriptsCache, this, NULL);
618 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 623 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
619 kTaskManagerWebCoreCssCache, 624 kTaskManagerWebCoreCssCache,
620 CompareWebCoreCssCache, this, NULL); 625 CompareWebCoreCssCache, this, NULL);
621 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 626 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
627 kTaskManagerVideoMemory,
628 CompareVideoMemory, this, NULL);
629 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
622 kTaskManagerFPS, 630 kTaskManagerFPS,
623 CompareFPS, this, NULL); 631 CompareFPS, this, NULL);
624 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 632 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
625 kTaskManagerSqliteMemoryUsed, 633 kTaskManagerSqliteMemoryUsed,
626 CompareSqliteMemoryUsed, this, NULL); 634 CompareSqliteMemoryUsed, this, NULL);
627 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_), 635 gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
628 kTaskManagerGoatsTeleported, 636 kTaskManagerGoatsTeleported,
629 CompareGoatsTeleported, this, NULL); 637 CompareGoatsTeleported, this, NULL);
630 treeview_ = gtk_tree_view_new_with_model(process_list_sort_); 638 treeview_ = gtk_tree_view_new_with_model(process_list_sort_);
631 639
632 // Insert all the columns. 640 // Insert all the columns.
633 TreeViewInsertTaskColumn(treeview_, IDS_TASK_MANAGER_TASK_COLUMN); 641 TreeViewInsertTaskColumn(treeview_, IDS_TASK_MANAGER_TASK_COLUMN);
634 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PROFILE_NAME_COLUMN); 642 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
635 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_SHARED_MEM_COLUMN); 643 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
636 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN); 644 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
637 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_CPU_COLUMN); 645 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_CPU_COLUMN);
638 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_NET_COLUMN); 646 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_NET_COLUMN);
639 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PROCESS_ID_COLUMN); 647 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PROCESS_ID_COLUMN);
640 TreeViewInsertColumn(treeview_, 648 TreeViewInsertColumn(treeview_,
641 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN); 649 IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN);
642 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN); 650 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN);
643 TreeViewInsertColumn(treeview_, 651 TreeViewInsertColumn(treeview_,
644 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN); 652 IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
645 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN); 653 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
654 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN);
646 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_FPS_COLUMN); 655 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_FPS_COLUMN);
647 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN); 656 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
648 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN); 657 TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
649 658
650 // Hide some columns by default. 659 // Hide some columns by default.
651 TreeViewColumnSetVisible(treeview_, kTaskManagerProfileName, false); 660 TreeViewColumnSetVisible(treeview_, kTaskManagerProfileName, false);
652 TreeViewColumnSetVisible(treeview_, kTaskManagerSharedMem, false); 661 TreeViewColumnSetVisible(treeview_, kTaskManagerSharedMem, false);
653 TreeViewColumnSetVisible(treeview_, kTaskManagerProcessID, false); 662 TreeViewColumnSetVisible(treeview_, kTaskManagerProcessID, false);
654 TreeViewColumnSetVisible(treeview_, kTaskManagerJavaScriptMemory, false); 663 TreeViewColumnSetVisible(treeview_, kTaskManagerJavaScriptMemory, false);
655 TreeViewColumnSetVisible(treeview_, kTaskManagerWebCoreImageCache, false); 664 TreeViewColumnSetVisible(treeview_, kTaskManagerWebCoreImageCache, false);
656 TreeViewColumnSetVisible(treeview_, kTaskManagerWebCoreScriptsCache, false); 665 TreeViewColumnSetVisible(treeview_, kTaskManagerWebCoreScriptsCache, false);
657 TreeViewColumnSetVisible(treeview_, kTaskManagerWebCoreCssCache, false); 666 TreeViewColumnSetVisible(treeview_, kTaskManagerWebCoreCssCache, false);
667 TreeViewColumnSetVisible(treeview_, kTaskManagerVideoMemory, false);
658 TreeViewColumnSetVisible(treeview_, kTaskManagerSqliteMemoryUsed, false); 668 TreeViewColumnSetVisible(treeview_, kTaskManagerSqliteMemoryUsed, false);
659 TreeViewColumnSetVisible(treeview_, kTaskManagerGoatsTeleported, false); 669 TreeViewColumnSetVisible(treeview_, kTaskManagerGoatsTeleported, false);
660 670
661 g_object_unref(process_list_); 671 g_object_unref(process_list_);
662 g_object_unref(process_list_sort_); 672 g_object_unref(process_list_sort_);
663 } 673 }
664 674
665 bool IsSharedByGroup(int col_id) { 675 bool IsSharedByGroup(int col_id) {
666 switch (col_id) { 676 switch (col_id) {
667 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: 677 case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 719
710 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN: 720 case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
711 return UTF16ToUTF8(model_->GetResourceWebCoreImageCacheSize(row)); 721 return UTF16ToUTF8(model_->GetResourceWebCoreImageCacheSize(row));
712 722
713 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN: 723 case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:
714 return UTF16ToUTF8(model_->GetResourceWebCoreScriptsCacheSize(row)); 724 return UTF16ToUTF8(model_->GetResourceWebCoreScriptsCacheSize(row));
715 725
716 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN: 726 case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:
717 return UTF16ToUTF8(model_->GetResourceWebCoreCSSCacheSize(row)); 727 return UTF16ToUTF8(model_->GetResourceWebCoreCSSCacheSize(row));
718 728
729 case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN:
730 return UTF16ToUTF8(model_->GetResourceVideoMemory(row));
731
719 case IDS_TASK_MANAGER_FPS_COLUMN: 732 case IDS_TASK_MANAGER_FPS_COLUMN:
720 return UTF16ToUTF8(model_->GetResourceFPS(row)); 733 return UTF16ToUTF8(model_->GetResourceFPS(row));
721 734
722 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: 735 case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN:
723 return UTF16ToUTF8(model_->GetResourceSqliteMemoryUsed(row)); 736 return UTF16ToUTF8(model_->GetResourceSqliteMemoryUsed(row));
724 737
725 case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN: // Goats Teleported! 738 case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN: // Goats Teleported!
726 return UTF16ToUTF8(model_->GetResourceGoatsTeleported(row)); 739 return UTF16ToUTF8(model_->GetResourceGoatsTeleported(row));
727 740
728 default: 741 default:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 std::string wk_scripts_cache; 784 std::string wk_scripts_cache;
772 if (TreeViewColumnIsVisible(treeview_, kTaskManagerWebCoreScriptsCache)) { 785 if (TreeViewColumnIsVisible(treeview_, kTaskManagerWebCoreScriptsCache)) {
773 wk_scripts_cache = 786 wk_scripts_cache =
774 GetModelText(row, IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN); 787 GetModelText(row, IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
775 } 788 }
776 std::string wk_css_cache; 789 std::string wk_css_cache;
777 if (TreeViewColumnIsVisible(treeview_, kTaskManagerWebCoreCssCache)) { 790 if (TreeViewColumnIsVisible(treeview_, kTaskManagerWebCoreCssCache)) {
778 wk_css_cache = 791 wk_css_cache =
779 GetModelText(row, IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN); 792 GetModelText(row, IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
780 } 793 }
794 std::string video_memory;
795 if (TreeViewColumnIsVisible(treeview_, kTaskManagerVideoMemory))
796 video_memory = GetModelText(row, IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN);
781 std::string fps; 797 std::string fps;
782 if (TreeViewColumnIsVisible(treeview_, kTaskManagerFPS)) 798 if (TreeViewColumnIsVisible(treeview_, kTaskManagerFPS))
783 fps = GetModelText(row, IDS_TASK_MANAGER_FPS_COLUMN); 799 fps = GetModelText(row, IDS_TASK_MANAGER_FPS_COLUMN);
784 std::string sqlite_memory; 800 std::string sqlite_memory;
785 if (TreeViewColumnIsVisible(treeview_, kTaskManagerSqliteMemoryUsed)) { 801 if (TreeViewColumnIsVisible(treeview_, kTaskManagerSqliteMemoryUsed)) {
786 sqlite_memory = 802 sqlite_memory =
787 GetModelText(row, IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN); 803 GetModelText(row, IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
788 } 804 }
789 805
790 std::string goats = 806 std::string goats =
791 GetModelText(row, IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN); 807 GetModelText(row, IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
792 808
793 bool is_background = model_->IsBackgroundResource(row) && 809 bool is_background = model_->IsBackgroundResource(row) &&
794 highlight_background_resources_; 810 highlight_background_resources_;
795 gtk_list_store_set(process_list_, iter, 811 gtk_list_store_set(process_list_, iter,
796 kTaskManagerIcon, icon, 812 kTaskManagerIcon, icon,
797 kTaskManagerTask, task_markup, 813 kTaskManagerTask, task_markup,
798 kTaskManagerProfileName, profile_name.c_str(), 814 kTaskManagerProfileName, profile_name.c_str(),
799 kTaskManagerSharedMem, shared_mem.c_str(), 815 kTaskManagerSharedMem, shared_mem.c_str(),
800 kTaskManagerPrivateMem, priv_mem.c_str(), 816 kTaskManagerPrivateMem, priv_mem.c_str(),
801 kTaskManagerCPU, cpu.c_str(), 817 kTaskManagerCPU, cpu.c_str(),
802 kTaskManagerNetwork, net.c_str(), 818 kTaskManagerNetwork, net.c_str(),
803 kTaskManagerProcessID, procid.c_str(), 819 kTaskManagerProcessID, procid.c_str(),
804 kTaskManagerJavaScriptMemory, javascript_memory.c_str(), 820 kTaskManagerJavaScriptMemory, javascript_memory.c_str(),
805 kTaskManagerWebCoreImageCache, wk_img_cache.c_str(), 821 kTaskManagerWebCoreImageCache, wk_img_cache.c_str(),
806 kTaskManagerWebCoreScriptsCache, wk_scripts_cache.c_str(), 822 kTaskManagerWebCoreScriptsCache, wk_scripts_cache.c_str(),
807 kTaskManagerWebCoreCssCache, wk_css_cache.c_str(), 823 kTaskManagerWebCoreCssCache, wk_css_cache.c_str(),
824 kTaskManagerVideoMemory, video_memory.c_str(),
808 kTaskManagerFPS, fps.c_str(), 825 kTaskManagerFPS, fps.c_str(),
809 kTaskManagerSqliteMemoryUsed, sqlite_memory.c_str(), 826 kTaskManagerSqliteMemoryUsed, sqlite_memory.c_str(),
810 kTaskManagerGoatsTeleported, goats.c_str(), 827 kTaskManagerGoatsTeleported, goats.c_str(),
811 kTaskManagerBackgroundColor, 828 kTaskManagerBackgroundColor,
812 is_background ? &kHighlightColor : NULL, 829 is_background ? &kHighlightColor : NULL,
813 -1); 830 -1);
814 g_object_unref(icon); 831 g_object_unref(icon);
815 g_free(task_markup); 832 g_free(task_markup);
816 } 833 }
817 834
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 guint keyval, 1033 guint keyval,
1017 GdkModifierType modifier) { 1034 GdkModifierType modifier) {
1018 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) { 1035 if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) {
1019 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget 1036 // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget
1020 // is destroyed. The deleted object will receive gtk signals otherwise. 1037 // is destroyed. The deleted object will receive gtk signals otherwise.
1021 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT); 1038 gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT);
1022 } 1039 }
1023 1040
1024 return TRUE; 1041 return TRUE;
1025 } 1042 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698