OLD | NEW |
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 "chrome/browser/ui/webui/bookmarks_ui.h" | 5 #include "chrome/browser/ui/webui/bookmarks_ui.h" |
6 | 6 |
7 #include "base/memory/ref_counted_memory.h" | 7 #include "base/memory/ref_counted_memory.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 BookmarksUIHTMLSource::BookmarksUIHTMLSource() { | 22 BookmarksUIHTMLSource::BookmarksUIHTMLSource() { |
23 } | 23 } |
24 | 24 |
25 std::string BookmarksUIHTMLSource::GetSource() { | 25 std::string BookmarksUIHTMLSource::GetSource() { |
26 return chrome::kChromeUIBookmarksHost; | 26 return chrome::kChromeUIBookmarksHost; |
27 } | 27 } |
28 | 28 |
29 void BookmarksUIHTMLSource::StartDataRequest( | 29 void BookmarksUIHTMLSource::StartDataRequest( |
30 const std::string& path, | 30 const std::string& path, |
31 bool is_incognito, | 31 int render_process_id, |
| 32 int render_view_id, |
32 const content::URLDataSource::GotDataCallback& callback) { | 33 const content::URLDataSource::GotDataCallback& callback) { |
33 NOTREACHED() << "We should never get here since the extension should have" | 34 NOTREACHED() << "We should never get here since the extension should have" |
34 << "been triggered"; | 35 << "been triggered"; |
35 | 36 |
36 callback.Run(NULL); | 37 callback.Run(NULL); |
37 } | 38 } |
38 | 39 |
39 std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const { | 40 std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const { |
40 NOTREACHED() << "We should never get here since the extension should have" | 41 NOTREACHED() << "We should never get here since the extension should have" |
41 << "been triggered"; | 42 << "been triggered"; |
(...skipping 15 matching lines...) Expand all Loading... |
57 Profile* profile = Profile::FromWebUI(web_ui); | 58 Profile* profile = Profile::FromWebUI(web_ui); |
58 content::URLDataSource::Add(profile, html_source); | 59 content::URLDataSource::Add(profile, html_source); |
59 } | 60 } |
60 | 61 |
61 // static | 62 // static |
62 base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes( | 63 base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes( |
63 ui::ScaleFactor scale_factor) { | 64 ui::ScaleFactor scale_factor) { |
64 return ui::ResourceBundle::GetSharedInstance(). | 65 return ui::ResourceBundle::GetSharedInstance(). |
65 LoadDataResourceBytesForScale(IDR_BOOKMARKS_FAVICON, scale_factor); | 66 LoadDataResourceBytesForScale(IDR_BOOKMARKS_FAVICON, scale_factor); |
66 } | 67 } |
OLD | NEW |