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

Side by Side Diff: chrome/renderer/extensions/extension_helper.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thakis comment, renamed LAZY_INSTANCE_INITIALIZER 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer/extensions/extension_helper.h" 5 #include "chrome/renderer/extensions/extension_helper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_value_serializer.h" 8 #include "base/json/json_value_serializer.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 27 matching lines...) Expand all
38 using WebKit::WebView; 38 using WebKit::WebView;
39 using webkit_glue::ImageResourceFetcher; 39 using webkit_glue::ImageResourceFetcher;
40 using webkit_glue::ResourceFetcher; 40 using webkit_glue::ResourceFetcher;
41 41
42 namespace { 42 namespace {
43 // Keeps a mapping from the frame pointer to a UserScriptIdleScheduler object. 43 // Keeps a mapping from the frame pointer to a UserScriptIdleScheduler object.
44 // We store this mapping per process, because a frame can jump from one 44 // We store this mapping per process, because a frame can jump from one
45 // document to another with adoptNode, and so having the object be a 45 // document to another with adoptNode, and so having the object be a
46 // RenderViewObserver means it might miss some notifications after it moves. 46 // RenderViewObserver means it might miss some notifications after it moves.
47 typedef std::map<WebFrame*, UserScriptIdleScheduler*> SchedulerMap; 47 typedef std::map<WebFrame*, UserScriptIdleScheduler*> SchedulerMap;
48 static base::LazyInstance<SchedulerMap> g_schedulers(base::LINKER_INITIALIZED); 48 static base::LazyInstance<SchedulerMap> g_schedulers =
49 LAZY_INSTANCE_INITIALIZER;
49 } 50 }
50 51
51 ExtensionHelper::ExtensionHelper(content::RenderView* render_view, 52 ExtensionHelper::ExtensionHelper(content::RenderView* render_view,
52 ExtensionDispatcher* extension_dispatcher) 53 ExtensionDispatcher* extension_dispatcher)
53 : content::RenderViewObserver(render_view), 54 : content::RenderViewObserver(render_view),
54 content::RenderViewObserverTracker<ExtensionHelper>(render_view), 55 content::RenderViewObserverTracker<ExtensionHelper>(render_view),
55 extension_dispatcher_(extension_dispatcher), 56 extension_dispatcher_(extension_dispatcher),
56 pending_app_icon_requests_(0), 57 pending_app_icon_requests_(0),
57 view_type_(content::VIEW_TYPE_INVALID), 58 view_type_(content::VIEW_TYPE_INVALID),
58 browser_window_id_(-1) { 59 browser_window_id_(-1) {
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 routing_id(), *pending_app_info_)); 364 routing_id(), *pending_app_info_));
364 pending_app_info_.reset(NULL); 365 pending_app_info_.reset(NULL);
365 } 366 }
366 367
367 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { 368 void ExtensionHelper::AddErrorToRootConsole(const string16& message) {
368 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 369 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
369 render_view()->GetWebView()->mainFrame()->addMessageToConsole( 370 render_view()->GetWebView()->mainFrame()->addMessageToConsole(
370 WebConsoleMessage(WebConsoleMessage::LevelError, message)); 371 WebConsoleMessage(WebConsoleMessage::LevelError, message));
371 } 372 }
372 } 373 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698