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

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

Issue 6479007: Attempt 3 at: Splits ChromeURLDataManager into 2 chunks:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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 #include "chrome/browser/dom_ui/bookmarks_ui.h" 5 #include "chrome/browser/dom_ui/bookmarks_ui.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/ref_counted_memory.h" 8 #include "base/ref_counted_memory.h"
9 #include "base/singleton.h" 9 #include "base/singleton.h"
10 #include "chrome/browser/browser_thread.h" 10 #include "chrome/browser/browser_thread.h"
11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 12 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
13 #include "chrome/browser/tab_contents/tab_contents.h"
12 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
13 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
14 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
15 17
16 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
17 // 19 //
18 // BookmarksUIHTMLSource 20 // BookmarksUIHTMLSource
19 // 21 //
20 //////////////////////////////////////////////////////////////////////////////// 22 ////////////////////////////////////////////////////////////////////////////////
21 23
(...skipping 19 matching lines...) Expand all
41 //////////////////////////////////////////////////////////////////////////////// 43 ////////////////////////////////////////////////////////////////////////////////
42 // 44 //
43 // BookmarksUI 45 // BookmarksUI
44 // 46 //
45 //////////////////////////////////////////////////////////////////////////////// 47 ////////////////////////////////////////////////////////////////////////////////
46 48
47 BookmarksUI::BookmarksUI(TabContents* contents) : DOMUI(contents) { 49 BookmarksUI::BookmarksUI(TabContents* contents) : DOMUI(contents) {
48 BookmarksUIHTMLSource* html_source = new BookmarksUIHTMLSource(); 50 BookmarksUIHTMLSource* html_source = new BookmarksUIHTMLSource();
49 51
50 // Set up the chrome://bookmarks/ source. 52 // Set up the chrome://bookmarks/ source.
51 BrowserThread::PostTask( 53 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
52 BrowserThread::IO, FROM_HERE,
53 NewRunnableMethod(
54 ChromeURLDataManager::GetInstance(),
55 &ChromeURLDataManager::AddDataSource,
56 make_scoped_refptr(html_source)));
57 } 54 }
58 55
59 // static 56 // static
60 RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() { 57 RefCountedMemory* BookmarksUI::GetFaviconResourceBytes() {
61 return ResourceBundle::GetSharedInstance(). 58 return ResourceBundle::GetSharedInstance().
62 LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON); 59 LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON);
63 } 60 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698