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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2740843003: Make kWebContentsAndroidKey unique (Closed)
Patch Set: Standalone Created 3 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #include "content/browser/media/session/pepper_playback_observer.h" 166 #include "content/browser/media/session/pepper_playback_observer.h"
167 #endif // ENABLE_PLUGINS 167 #endif // ENABLE_PLUGINS
168 168
169 namespace content { 169 namespace content {
170 namespace { 170 namespace {
171 171
172 const int kMinimumDelayBetweenLoadingUpdatesMS = 100; 172 const int kMinimumDelayBetweenLoadingUpdatesMS = 100;
173 const char kDotGoogleDotCom[] = ".google.com"; 173 const char kDotGoogleDotCom[] = ".google.com";
174 174
175 #if defined(OS_ANDROID) 175 #if defined(OS_ANDROID)
176 const char kWebContentsAndroidKey[] = "web_contents_android"; 176 const void* const kWebContentsAndroidKey = &kWebContentsAndroidKey;
177 #endif // OS_ANDROID 177 #endif // OS_ANDROID
178 178
179 base::LazyInstance<std::vector<WebContentsImpl::CreatedCallback>>:: 179 base::LazyInstance<std::vector<WebContentsImpl::CreatedCallback>>::
180 DestructorAtExit g_created_callbacks = LAZY_INSTANCE_INITIALIZER; 180 DestructorAtExit g_created_callbacks = LAZY_INSTANCE_INITIALIZER;
181 181
182 void NotifyCacheOnIO( 182 void NotifyCacheOnIO(
183 scoped_refptr<net::URLRequestContextGetter> request_context, 183 scoped_refptr<net::URLRequestContextGetter> request_context,
184 const GURL& url, 184 const GURL& url,
185 const std::string& http_method) { 185 const std::string& http_method) {
186 net::HttpCache* cache = request_context->GetURLRequestContext()-> 186 net::HttpCache* cache = request_context->GetURLRequestContext()->
(...skipping 5221 matching lines...) Expand 10 before | Expand all | Expand 10 after
5408 RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host); 5408 RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
5409 if (!render_view_host) 5409 if (!render_view_host)
5410 continue; 5410 continue;
5411 render_view_host_set.insert(render_view_host); 5411 render_view_host_set.insert(render_view_host);
5412 } 5412 }
5413 for (RenderViewHost* render_view_host : render_view_host_set) 5413 for (RenderViewHost* render_view_host : render_view_host_set)
5414 render_view_host->OnWebkitPreferencesChanged(); 5414 render_view_host->OnWebkitPreferencesChanged();
5415 } 5415 }
5416 5416
5417 } // namespace content 5417 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698