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

Unified Diff: content/browser/webui/web_ui_url_loader_factory.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Rebased again Created 3 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/webrtc/webrtc_eventlog_host.cc ('k') | content/child/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_url_loader_factory.cc
diff --git a/content/browser/webui/web_ui_url_loader_factory.cc b/content/browser/webui/web_ui_url_loader_factory.cc
index 99bc1b30899315efd42bb003cd921af44688c9e7..74d4417be5eae6b1a7572ecf045b615d6cae185e 100644
--- a/content/browser/webui/web_ui_url_loader_factory.cc
+++ b/content/browser/webui/web_ui_url_loader_factory.cc
@@ -38,7 +38,7 @@ namespace {
class WebUIURLLoaderFactory;
base::LazyInstance<std::map<int, std::unique_ptr<WebUIURLLoaderFactory>>>::Leaky
- g_factories = LAZY_INSTANCE_INITIALIZER;
+ g_webui_url_loader_factories = LAZY_INSTANCE_INITIALIZER;
void CallOnError(mojom::URLLoaderClientPtrInfo client_info, int error_code) {
mojom::URLLoaderClientPtr client;
@@ -277,7 +277,7 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory,
// FrameTreeNode::Observer implementation:
void OnFrameTreeNodeDestroyed(FrameTreeNode* node) override {
- g_factories.Get().erase(frame_tree_node_id_);
+ g_webui_url_loader_factories.Get().erase(frame_tree_node_id_);
}
private:
@@ -292,9 +292,9 @@ class WebUIURLLoaderFactory : public mojom::URLLoaderFactory,
mojom::URLLoaderFactoryPtr CreateWebUIURLLoader(FrameTreeNode* node) {
int ftn_id = node->frame_tree_node_id();
- if (g_factories.Get()[ftn_id].get() == nullptr)
- g_factories.Get()[ftn_id] = base::MakeUnique<WebUIURLLoaderFactory>(node);
- return g_factories.Get()[ftn_id]->CreateBinding();
+ if (g_webui_url_loader_factories.Get()[ftn_id].get() == nullptr)
+ g_webui_url_loader_factories.Get()[ftn_id] = base::MakeUnique<WebUIURLLoaderFactory>(node);
+ return g_webui_url_loader_factories.Get()[ftn_id]->CreateBinding();
}
} // namespace content
« no previous file with comments | « content/browser/webrtc/webrtc_eventlog_host.cc ('k') | content/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698