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

Side by Side Diff: chrome/browser/ui/webui/favicon_source.h

Issue 861333002: [Favicon] Minor code cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed DCHECK(). Created 5 years, 11 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 | « chrome/browser/favicon/favicon_service.cc ('k') | chrome/browser/ui/webui/favicon_source.cc » ('j') | 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 #ifndef CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
6 #define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_ 6 #define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 // Values: ['largest', size/aa@bx/] 34 // Values: ['largest', size/aa@bx/]
35 // 'largest': Specifies that the largest available favicon is requested. 35 // 'largest': Specifies that the largest available favicon is requested.
36 // Example: chrome://favicon/largest/http://www.google.com/ 36 // Example: chrome://favicon/largest/http://www.google.com/
37 // 'size/aa@bx/': 37 // 'size/aa@bx/':
38 // Specifies the requested favicon's size in DIP (aa) and the requested 38 // Specifies the requested favicon's size in DIP (aa) and the requested
39 // favicon's scale factor. (b). 39 // favicon's scale factor. (b).
40 // The supported requested DIP sizes are: 16x16, 32x32 and 64x64. 40 // The supported requested DIP sizes are: 16x16, 32x32 and 64x64.
41 // If the parameter is unspecified, the requested favicon's size defaults 41 // If the parameter is unspecified, the requested favicon's size defaults
42 // to 16 and the requested scale factor defaults to 1x. 42 // to 16 and the requested scale factor defaults to 1x.
43 // Example: chrome://favicon/size/16@2x/http://www.google.com/ 43 // Example: chrome://favicon/size/16@2x/http://www.google.com/
44 // 'urlmodifier' Optional 44 // 'urlmodifier' Optional
45 // Values: ['iconurl', 'origin'] 45 // Values: ['iconurl', 'origin']
46 // 'iconurl': Specifies that the url parameter refers to the URL of 46 // 'iconurl': Specifies that the url parameter refers to the URL of
47 // the favicon image as opposed to the URL of the page that the favicon is 47 // the favicon image as opposed to the URL of the page that the favicon is
48 // on. 48 // on.
49 // Example: chrome://favicon/iconurl/http://www.google.com/favicon.ico 49 // Example: chrome://favicon/iconurl/http://www.google.com/favicon.ico
50 // 'origin': Specifies that the URL should be converted to a form with 50 // 'origin': Specifies that the URL should be converted to a form with
51 // an empty path and a valid scheme. The converted URL will be used to 51 // an empty path and a valid scheme. The converted URL will be used to
52 // request the favicon from the favicon service. 52 // request the favicon from the favicon service.
53 // Examples: 53 // Examples:
54 // chrome://favicon/origin/http://example.com/a 54 // chrome://favicon/origin/http://example.com/a
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // database doesn't have a favicon for a webpage. Indexed by IconSize values. 134 // database doesn't have a favicon for a webpage. Indexed by IconSize values.
135 scoped_refptr<base::RefCountedMemory> default_favicons_[NUM_SIZES]; 135 scoped_refptr<base::RefCountedMemory> default_favicons_[NUM_SIZES];
136 136
137 // The favicon_base::IconTypes of icon that this FaviconSource handles. 137 // The favicon_base::IconTypes of icon that this FaviconSource handles.
138 int icon_types_; 138 int icon_types_;
139 139
140 DISALLOW_COPY_AND_ASSIGN(FaviconSource); 140 DISALLOW_COPY_AND_ASSIGN(FaviconSource);
141 }; 141 };
142 142
143 #endif // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_ 143 #endif // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
OLDNEW
« no previous file with comments | « chrome/browser/favicon/favicon_service.cc ('k') | chrome/browser/ui/webui/favicon_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698