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

Side by Side Diff: chrome/browser/performance_monitor/event.h

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
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 #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_ 5 #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
6 #define CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_ 6 #define CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
7 7
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace performance_monitor { 12 namespace performance_monitor {
13 13
14 // IMPORTANT: To add new events, please 14 // IMPORTANT: To add new events, please
15 // - Place the new event above EVENT_NUMBER_OF_EVENTS. 15 // - Place the new event above EVENT_NUMBER_OF_EVENTS.
16 // - Add a member to the EventKeyChar enum in key_builder.cc. 16 // - Add a member to the EventKeyChar enum in key_builder.cc.
17 // - Add the appropriate messages in generated_resources.grd. 17 // - Add the appropriate messages in generated_resources.grd.
18 // - Add the appropriate functions in 18 // - Add the appropriate functions in
19 // chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.h. 19 // chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.h.
20 enum EventType { 20 enum EventType {
21 EVENT_UNDEFINED, 21 EVENT_UNDEFINED,
22
23 // Extension-Related events
22 EVENT_EXTENSION_INSTALL, 24 EVENT_EXTENSION_INSTALL,
23 EVENT_EXTENSION_UNINSTALL, 25 EVENT_EXTENSION_UNINSTALL,
24 EVENT_EXTENSION_UPDATE, 26 EVENT_EXTENSION_UPDATE,
25 EVENT_EXTENSION_ENABLE, 27 EVENT_EXTENSION_ENABLE,
26 EVENT_EXTENSION_DISABLE, 28 EVENT_EXTENSION_DISABLE,
29
30 // Chrome's version has changed.
27 EVENT_CHROME_UPDATE, 31 EVENT_CHROME_UPDATE,
28 EVENT_RENDERER_FREEZE, 32
33 // Renderer-Failure related events; these correspond to the RENDERER_HANG
34 // event, and the two termination statuses ABNORMAL_EXIT and PROCESS_KILLED,
35 // respectively.
36 EVENT_RENDERER_HANG,
29 EVENT_RENDERER_CRASH, 37 EVENT_RENDERER_CRASH,
30 EVENT_KILLED_BY_OS_CRASH, 38 EVENT_RENDERER_KILLED,
39
40 // Chrome did not shut down correctly.
31 EVENT_UNCLEAN_EXIT, 41 EVENT_UNCLEAN_EXIT,
42
32 EVENT_NUMBER_OF_EVENTS 43 EVENT_NUMBER_OF_EVENTS
33 }; 44 };
34 45
35 const char* EventTypeToString(EventType event_type); 46 const char* EventTypeToString(EventType event_type);
36 47
37 // The wrapper class for the JSON-generated event classes for the performance 48 // The wrapper class for the JSON-generated event classes for the performance
38 // monitor. This class is used so we can pass around events in a single class, 49 // monitor. This class is used so we can pass around events in a single class,
39 // rather than having a variety of different types (since JSON does not 50 // rather than having a variety of different types (since JSON does not
40 // currently support inheritance). Since the class will occasionally need to 51 // currently support inheritance). Since the class will occasionally need to
41 // be compared against other events, we construct it with type and time. Other 52 // be compared against other events, we construct it with type and time. Other
(...skipping 22 matching lines...) Expand all
64 // The time at which the event was recorded. 75 // The time at which the event was recorded.
65 base::Time time_; 76 base::Time time_;
66 // The full JSON-generated value representing the information of the event; 77 // The full JSON-generated value representing the information of the event;
67 // these data are described in chrome/browser/performance_monitor/events.json. 78 // these data are described in chrome/browser/performance_monitor/events.json.
68 scoped_ptr<base::DictionaryValue> data_; 79 scoped_ptr<base::DictionaryValue> data_;
69 }; 80 };
70 81
71 } // namespace performance_monitor 82 } // namespace performance_monitor
72 83
73 #endif // CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_ 84 #endif // CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/performance_monitor/database_unittest.cc ('k') | chrome/browser/performance_monitor/events.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698