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

Side by Side Diff: chrome/browser/dom_ui/bookmarks_ui.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/diagnostics/diagnostics_main.cc ('k') | chrome/browser/dom_ui/bug_report_ui.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) 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 #include "chrome/browser/dom_ui/bookmarks_ui.h" 5 #include "chrome/browser/dom_ui/bookmarks_ui.h"
6 6
7 #include "app/resource_bundle.h"
8 #include "base/message_loop.h" 7 #include "base/message_loop.h"
9 #include "base/ref_counted_memory.h" 8 #include "base/ref_counted_memory.h"
10 #include "base/singleton.h" 9 #include "base/singleton.h"
11 #include "chrome/browser/browser_thread.h" 10 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 11 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
13 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
14 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
14 #include "ui/base/resource/resource_bundle.h"
15 15
16 //////////////////////////////////////////////////////////////////////////////// 16 ////////////////////////////////////////////////////////////////////////////////
17 // 17 //
18 // BookmarksUIHTMLSource 18 // BookmarksUIHTMLSource
19 // 19 //
20 //////////////////////////////////////////////////////////////////////////////// 20 ////////////////////////////////////////////////////////////////////////////////
21 21
22 BookmarksUIHTMLSource::BookmarksUIHTMLSource() 22 BookmarksUIHTMLSource::BookmarksUIHTMLSource()
23 : DataSource(chrome::kChromeUIBookmarksHost, MessageLoop::current()) { 23 : DataSource(chrome::kChromeUIBookmarksHost, MessageLoop::current()) {
24 } 24 }
(...skipping 29 matching lines...) Expand all
54 ChromeURLDataManager::GetInstance(), 54 ChromeURLDataManager::GetInstance(),
55 &ChromeURLDataManager::AddDataSource, 55 &ChromeURLDataManager::AddDataSource,
56 make_scoped_refptr(html_source))); 56 make_scoped_refptr(html_source)));
57 } 57 }
58 58
59 // static 59 // static
60 RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() { 60 RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() {
61 return ResourceBundle::GetSharedInstance(). 61 return ResourceBundle::GetSharedInstance().
62 LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON); 62 LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON);
63 } 63 }
OLDNEW
« no previous file with comments | « chrome/browser/diagnostics/diagnostics_main.cc ('k') | chrome/browser/dom_ui/bug_report_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698