OLD | NEW |
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 29 matching lines...) Expand all Loading... |
40 using WebKit::WebView; | 40 using WebKit::WebView; |
41 using webkit_glue::ImageResourceFetcher; | 41 using webkit_glue::ImageResourceFetcher; |
42 using webkit_glue::ResourceFetcher; | 42 using webkit_glue::ResourceFetcher; |
43 | 43 |
44 namespace { | 44 namespace { |
45 // Keeps a mapping from the frame pointer to a UserScriptIdleScheduler object. | 45 // Keeps a mapping from the frame pointer to a UserScriptIdleScheduler object. |
46 // We store this mapping per process, because a frame can jump from one | 46 // We store this mapping per process, because a frame can jump from one |
47 // document to another with adoptNode, and so having the object be a | 47 // document to another with adoptNode, and so having the object be a |
48 // RenderViewObserver means it might miss some notifications after it moves. | 48 // RenderViewObserver means it might miss some notifications after it moves. |
49 typedef std::map<WebFrame*, UserScriptIdleScheduler*> SchedulerMap; | 49 typedef std::map<WebFrame*, UserScriptIdleScheduler*> SchedulerMap; |
50 static base::LazyInstance<SchedulerMap> g_schedulers(base::LINKER_INITIALIZED); | 50 static base::LazyInstance<SchedulerMap> g_schedulers = |
| 51 LAZY_INSTANCE_INITIALIZER; |
51 } | 52 } |
52 | 53 |
53 ExtensionHelper::ExtensionHelper(content::RenderView* render_view, | 54 ExtensionHelper::ExtensionHelper(content::RenderView* render_view, |
54 ExtensionDispatcher* extension_dispatcher) | 55 ExtensionDispatcher* extension_dispatcher) |
55 : content::RenderViewObserver(render_view), | 56 : content::RenderViewObserver(render_view), |
56 content::RenderViewObserverTracker<ExtensionHelper>(render_view), | 57 content::RenderViewObserverTracker<ExtensionHelper>(render_view), |
57 extension_dispatcher_(extension_dispatcher), | 58 extension_dispatcher_(extension_dispatcher), |
58 pending_app_icon_requests_(0), | 59 pending_app_icon_requests_(0), |
59 view_type_(content::VIEW_TYPE_INVALID), | 60 view_type_(content::VIEW_TYPE_INVALID), |
60 browser_window_id_(-1) { | 61 browser_window_id_(-1) { |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 routing_id(), *pending_app_info_)); | 366 routing_id(), *pending_app_info_)); |
366 pending_app_info_.reset(NULL); | 367 pending_app_info_.reset(NULL); |
367 } | 368 } |
368 | 369 |
369 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { | 370 void ExtensionHelper::AddErrorToRootConsole(const string16& message) { |
370 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { | 371 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { |
371 render_view()->GetWebView()->mainFrame()->addMessageToConsole( | 372 render_view()->GetWebView()->mainFrame()->addMessageToConsole( |
372 WebConsoleMessage(WebConsoleMessage::LevelError, message)); | 373 WebConsoleMessage(WebConsoleMessage::LevelError, message)); |
373 } | 374 } |
374 } | 375 } |
OLD | NEW |