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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.cc

Issue 10987040: Fix CPM casting issue; refactor renderer crash events (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Nit fixes, latest master Created 8 years, 2 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
« no previous file with comments | « chrome/browser/ui/webui/performance_monitor/performance_monitor_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/webui/performance_monitor/performance_monitor_l10n.h " 5 #include "chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.h "
6 6
7 #include "grit/chromium_strings.h" 7 #include "grit/chromium_strings.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 break; 69 break;
70 case EVENT_EXTENSION_ENABLE: 70 case EVENT_EXTENSION_ENABLE:
71 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_ENABLE_EVENT; 71 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_ENABLE_EVENT;
72 break; 72 break;
73 case EVENT_EXTENSION_DISABLE: 73 case EVENT_EXTENSION_DISABLE:
74 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT; 74 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT;
75 break; 75 break;
76 case EVENT_CHROME_UPDATE: 76 case EVENT_CHROME_UPDATE:
77 string_id = IDS_PERFORMANCE_MONITOR_CHROME_UPDATE_EVENT; 77 string_id = IDS_PERFORMANCE_MONITOR_CHROME_UPDATE_EVENT;
78 break; 78 break;
79 case EVENT_RENDERER_FREEZE: 79 case EVENT_RENDERER_HANG:
80 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_FREEZE_EVENT; 80 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_HANG_EVENT;
81 break; 81 break;
82 case EVENT_RENDERER_CRASH: 82 case EVENT_RENDERER_CRASH:
83 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT; 83 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT;
84 break; 84 break;
85 case EVENT_KILLED_BY_OS_CRASH: 85 case EVENT_RENDERER_KILLED:
86 string_id = IDS_PERFORMANCE_MONITOR_KILLED_BY_OS_CRASH_EVENT; 86 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_KILLED_EVENT;
87 break; 87 break;
88 case EVENT_UNCLEAN_EXIT: 88 case EVENT_UNCLEAN_EXIT:
89 string_id = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT; 89 string_id = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT;
90 break; 90 break;
91 default: 91 default:
92 NOTREACHED(); 92 NOTREACHED();
93 } 93 }
94 94
95 return l10n_util::GetStringUTF16(string_id); 95 return l10n_util::GetStringUTF16(string_id);
96 } 96 }
(...skipping 16 matching lines...) Expand all
113 case EVENT_EXTENSION_ENABLE: 113 case EVENT_EXTENSION_ENABLE:
114 string_id1 = IDS_PERFORMANCE_MONITOR_EXTENSION_ENABLE_EVENT_DESCRIPTION; 114 string_id1 = IDS_PERFORMANCE_MONITOR_EXTENSION_ENABLE_EVENT_DESCRIPTION;
115 break; 115 break;
116 case EVENT_EXTENSION_DISABLE: 116 case EVENT_EXTENSION_DISABLE:
117 string_id1 = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT_DESCRIPTION; 117 string_id1 = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT_DESCRIPTION;
118 break; 118 break;
119 case EVENT_CHROME_UPDATE: 119 case EVENT_CHROME_UPDATE:
120 string_id1 = IDS_PERFORMANCE_MONITOR_CHROME_UPDATE_EVENT_DESCRIPTION; 120 string_id1 = IDS_PERFORMANCE_MONITOR_CHROME_UPDATE_EVENT_DESCRIPTION;
121 string_id2 = IDS_SHORT_PRODUCT_NAME; 121 string_id2 = IDS_SHORT_PRODUCT_NAME;
122 break; 122 break;
123 case EVENT_RENDERER_FREEZE: 123 case EVENT_RENDERER_HANG:
124 string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_FREEZE_EVENT_DESCRIPTION; 124 string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_HANG_EVENT_DESCRIPTION;
125 break; 125 break;
126 case EVENT_RENDERER_CRASH: 126 case EVENT_RENDERER_CRASH:
127 string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT_DESCRIPTION; 127 string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT_DESCRIPTION;
128 string_id2 = IDS_SAD_TAB_TITLE; 128 string_id2 = IDS_SAD_TAB_TITLE;
129 break; 129 break;
130 case EVENT_KILLED_BY_OS_CRASH: 130 case EVENT_RENDERER_KILLED:
131 string_id1 = IDS_PERFORMANCE_MONITOR_KILLED_BY_OS_CRASH_EVENT_DESCRIPTION; 131 string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_KILLED_EVENT_DESCRIPTION;
132 string_id2 = IDS_KILLED_TAB_TITLE; 132 string_id2 = IDS_KILLED_TAB_TITLE;
133 break; 133 break;
134 case EVENT_UNCLEAN_EXIT: 134 case EVENT_UNCLEAN_EXIT:
135 string_id1 = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT_DESCRIPTION; 135 string_id1 = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT_DESCRIPTION;
136 string_id2 = IDS_SHORT_PRODUCT_NAME; 136 string_id2 = IDS_SHORT_PRODUCT_NAME;
137 break; 137 break;
138 default: 138 default:
139 NOTREACHED(); 139 NOTREACHED();
140 } 140 }
141 141
(...skipping 20 matching lines...) Expand all
162 break; 162 break;
163 case EVENT_EXTENSION_UPDATE: 163 case EVENT_EXTENSION_UPDATE:
164 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_UPDATE_EVENT_MOUSEOVER; 164 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_UPDATE_EVENT_MOUSEOVER;
165 break; 165 break;
166 case EVENT_EXTENSION_ENABLE: 166 case EVENT_EXTENSION_ENABLE:
167 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_ENABLE_EVENT_MOUSEOVER; 167 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_ENABLE_EVENT_MOUSEOVER;
168 break; 168 break;
169 case EVENT_EXTENSION_DISABLE: 169 case EVENT_EXTENSION_DISABLE:
170 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT_MOUSEOVER; 170 string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT_MOUSEOVER;
171 break; 171 break;
172 case EVENT_RENDERER_FREEZE: 172 case EVENT_RENDERER_HANG:
173 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_FREEZE_EVENT_MOUSEOVER; 173 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_HANG_EVENT_MOUSEOVER;
174 break; 174 break;
175 case EVENT_RENDERER_CRASH: 175 case EVENT_RENDERER_CRASH:
176 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT_MOUSEOVER; 176 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT_MOUSEOVER;
177 break; 177 break;
178 case EVENT_KILLED_BY_OS_CRASH: 178 case EVENT_RENDERER_KILLED:
179 string_id = IDS_PERFORMANCE_MONITOR_KILLED_BY_OS_CRASH_EVENT_MOUSEOVER; 179 string_id = IDS_PERFORMANCE_MONITOR_RENDERER_KILLED_EVENT_MOUSEOVER;
180 break; 180 break;
181 case EVENT_UNCLEAN_EXIT: 181 case EVENT_UNCLEAN_EXIT:
182 string_id = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT_MOUSEOVER; 182 string_id = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT_MOUSEOVER;
183 break; 183 break;
184 default: 184 default:
185 NOTREACHED(); 185 NOTREACHED();
186 } 186 }
187 187
188 return l10n_util::GetStringUTF16(string_id); 188 return l10n_util::GetStringUTF16(string_id);
189 } 189 }
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 string_id = IDS_PERFORMANCE_MONITOR_PERCENT_UNIT; 401 string_id = IDS_PERFORMANCE_MONITOR_PERCENT_UNIT;
402 break; 402 break;
403 default: 403 default:
404 NOTREACHED(); 404 NOTREACHED();
405 } 405 }
406 406
407 return l10n_util::GetStringUTF16(string_id); 407 return l10n_util::GetStringUTF16(string_id);
408 } 408 }
409 409
410 } // namespace performance_monitor 410 } // namespace performance_monitor
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/performance_monitor/performance_monitor_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698