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

Side by Side Diff: chrome/browser/possible_url_model.h

Issue 6651014: Applied the IconType. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_POSSIBLE_URL_MODEL_H_ 5 #ifndef CHROME_BROWSER_POSSIBLE_URL_MODEL_H_
6 #define CHROME_BROWSER_POSSIBLE_URL_MODEL_H_ 6 #define CHROME_BROWSER_POSSIBLE_URL_MODEL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 22 matching lines...) Expand all
33 void OnHistoryQueryComplete(HistoryService::Handle h, 33 void OnHistoryQueryComplete(HistoryService::Handle h,
34 history::QueryResults* result); 34 history::QueryResults* result);
35 35
36 const GURL& GetURL(int row); 36 const GURL& GetURL(int row);
37 const std::wstring& GetTitle(int row); 37 const std::wstring& GetTitle(int row);
38 38
39 virtual void OnFavIconAvailable(FaviconService::Handle h, 39 virtual void OnFavIconAvailable(FaviconService::Handle h,
40 bool fav_icon_available, 40 bool fav_icon_available,
41 scoped_refptr<RefCountedMemory> data, 41 scoped_refptr<RefCountedMemory> data,
42 bool expired, 42 bool expired,
43 GURL icon_url); 43 GURL icon_url,
44 history::IconType icon_type);
44 45
45 // TableModel overrides 46 // TableModel overrides
46 virtual int RowCount() OVERRIDE; 47 virtual int RowCount() OVERRIDE;
47 virtual string16 GetText(int row, int col_id) OVERRIDE; 48 virtual string16 GetText(int row, int col_id) OVERRIDE;
48 virtual SkBitmap GetIcon(int row) OVERRIDE; 49 virtual SkBitmap GetIcon(int row) OVERRIDE;
49 virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE; 50 virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
50 virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; 51 virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
51 52
52 private: 53 private:
53 // The current profile. 54 // The current profile.
(...skipping 10 matching lines...) Expand all
64 std::vector<Result> results_; 65 std::vector<Result> results_;
65 66
66 // Map Result::index -> Favicon. 67 // Map Result::index -> Favicon.
67 typedef std::map<size_t, SkBitmap> FavIconMap; 68 typedef std::map<size_t, SkBitmap> FavIconMap;
68 FavIconMap fav_icon_map_; 69 FavIconMap fav_icon_map_;
69 70
70 DISALLOW_COPY_AND_ASSIGN(PossibleURLModel); 71 DISALLOW_COPY_AND_ASSIGN(PossibleURLModel);
71 }; 72 };
72 73
73 #endif // CHROME_BROWSER_POSSIBLE_URL_MODEL_H_ 74 #endif // CHROME_BROWSER_POSSIBLE_URL_MODEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698