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

Side by Side Diff: Source/web/WebDOMActivityLogger.cpp

Issue 257803006: Fixing wrong extension ID in Activity Log entries. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: moved ActivityLogger to V8PerContextData Created 6 years, 7 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 WebString getTitle() 80 WebString getTitle()
81 { 81 {
82 if (Document* document = currentDOMWindow(v8::Isolate::GetCurrent())->do cument()) 82 if (Document* document = currentDOMWindow(v8::Isolate::GetCurrent())->do cument())
83 return WebString(document->title()); 83 return WebString(document->title());
84 return WebString(); 84 return WebString();
85 } 85 }
86 86
87 OwnPtr<WebDOMActivityLogger> m_domActivityLogger; 87 OwnPtr<WebDOMActivityLogger> m_domActivityLogger;
88 }; 88 };
89 89
90 bool hasDOMActivityLogger(int worldId, const WebString& extensionId)
91 {
92 return V8DOMActivityLogger::activityLogger(worldId, extensionId);
93 }
94
95 void setDOMActivityLogger(int worldId, const WebString& extensionId, WebDOMActiv ityLogger* logger)
96 {
97 ASSERT(logger);
98 V8DOMActivityLogger::setActivityLogger(worldId, extensionId, adoptPtr(new DO MActivityLoggerContainer(adoptPtr(logger))));
99 }
100
101 // TODO(pmarch): remove the following two methods after modifying Chrome to
haraken 2014/05/08 23:47:45 TODO(pmarch) => FIXME
pmarch 2014/05/09 14:53:52 Done.
102 // use the above ones.
90 bool hasDOMActivityLogger(int worldId) 103 bool hasDOMActivityLogger(int worldId)
91 { 104 {
92 return V8DOMActivityLogger::activityLogger(worldId); 105 return V8DOMActivityLogger::activityLogger(worldId, WebString());
93 } 106 }
94 107
95 void setDOMActivityLogger(int worldId, WebDOMActivityLogger* logger) 108 void setDOMActivityLogger(int worldId, WebDOMActivityLogger* logger)
96 { 109 {
97 ASSERT(logger); 110 ASSERT(logger);
98 V8DOMActivityLogger::setActivityLogger(worldId, adoptPtr(new DOMActivityLogg erContainer(adoptPtr(logger)))); 111 V8DOMActivityLogger::setActivityLogger(worldId, WebString(), adoptPtr(new DO MActivityLoggerContainer(adoptPtr(logger))));
99 } 112 }
100 113
101 } // namespace blink 114 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698