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

Unified Diff: content/browser/debugger/devtools_client_host.cc

Issue 8493016: content: Remove 16 exit time destructors and 15 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac compile Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/debugger/devtools_client_host.cc
diff --git a/content/browser/debugger/devtools_client_host.cc b/content/browser/debugger/devtools_client_host.cc
index 5e797233edad4ad5a13eb2dfb8ccb39fe84cad9c..3250dc87348a4c0c3a8a8a4d831492c6a32dce94 100644
--- a/content/browser/debugger/devtools_client_host.cc
+++ b/content/browser/debugger/devtools_client_host.cc
@@ -4,17 +4,23 @@
#include <algorithm>
+#include "base/lazy_instance.h"
#include "base/logging.h"
#include "content/browser/debugger/devtools_client_host.h"
#include "content/browser/debugger/devtools_manager.h"
-DevToolsClientHost::DevToolsClientHostList DevToolsClientHost::instances_;
+typedef std::vector<DevToolsClientHost*> DevToolsClientHostList;
+namespace {
+base::LazyInstance<DevToolsClientHostList,
+ base::LeakyLazyInstanceTraits<DevToolsClientHostList> >
+ g_instances(base::LINKER_INITIALIZED);
+} // namespace
// static
DevToolsClientHost* DevToolsClientHost::FindOwnerClientHost(
RenderViewHost* client_rvh) {
- for (DevToolsClientHostList::iterator it = instances_.begin();
- it != instances_.end(); ++it) {
+ for (DevToolsClientHostList::iterator it = g_instances.Get().begin();
+ it != g_instances.Get().end(); ++it) {
if ((*it)->GetClientRenderViewHost() == client_rvh)
return *it;
}
@@ -22,11 +28,11 @@ DevToolsClientHost* DevToolsClientHost::FindOwnerClientHost(
}
DevToolsClientHost::~DevToolsClientHost() {
- DevToolsClientHostList::iterator it = std::find(instances_.begin(),
- instances_.end(),
+ DevToolsClientHostList::iterator it = std::find(g_instances.Get().begin(),
+ g_instances.Get().end(),
this);
- DCHECK(it != instances_.end());
- instances_.erase(it);
+ DCHECK(it != g_instances.Get().end());
+ g_instances.Get().erase(it);
}
RenderViewHost* DevToolsClientHost::GetClientRenderViewHost() {
@@ -34,7 +40,7 @@ RenderViewHost* DevToolsClientHost::GetClientRenderViewHost() {
}
DevToolsClientHost::DevToolsClientHost() : close_listener_(NULL) {
- instances_.push_back(this);
+ g_instances.Get().push_back(this);
}
void DevToolsClientHost::ForwardToDevToolsAgent(const IPC::Message& message) {
« no previous file with comments | « content/browser/debugger/devtools_client_host.h ('k') | content/browser/debugger/devtools_http_protocol_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698