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

Side by Side Diff: content/public/browser/content_browser_client.cc

Issue 333493002: Load the default favicon as a native image, rather than as a Skia image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | 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/public/browser/content_browser_client.h" 5 #include "content/public/browser/content_browser_client.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "ui/gfx/image/image_skia.h" 8 #include "ui/gfx/image/image_skia.h"
9 #include "url/gurl.h" 9 #include "url/gurl.h"
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 98 }
99 99
100 std::string ContentBrowserClient::GetApplicationLocale() { 100 std::string ContentBrowserClient::GetApplicationLocale() {
101 return "en-US"; 101 return "en-US";
102 } 102 }
103 103
104 std::string ContentBrowserClient::GetAcceptLangs(BrowserContext* context) { 104 std::string ContentBrowserClient::GetAcceptLangs(BrowserContext* context) {
105 return std::string(); 105 return std::string();
106 } 106 }
107 107
108 gfx::ImageSkia* ContentBrowserClient::GetDefaultFavicon() { 108 const gfx::ImageSkia* ContentBrowserClient::GetDefaultFavicon() {
109 static gfx::ImageSkia* empty = new gfx::ImageSkia(); 109 static gfx::ImageSkia* empty = new gfx::ImageSkia();
110 return empty; 110 return empty;
111 } 111 }
112 112
113 bool ContentBrowserClient::AllowAppCache(const GURL& manifest_url, 113 bool ContentBrowserClient::AllowAppCache(const GURL& manifest_url,
114 const GURL& first_party, 114 const GURL& first_party,
115 ResourceContext* context) { 115 ResourceContext* context) {
116 return true; 116 return true;
117 } 117 }
118 118
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 313
314 #if defined(VIDEO_HOLE) 314 #if defined(VIDEO_HOLE)
315 ExternalVideoSurfaceContainer* 315 ExternalVideoSurfaceContainer*
316 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( 316 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
317 WebContents* web_contents) { 317 WebContents* web_contents) {
318 return NULL; 318 return NULL;
319 } 319 }
320 #endif 320 #endif
321 321
322 } // namespace content 322 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698