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

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

Issue 342020: First of several patches to get rid of MessageLoop caching now that we have C... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/filebrowse_ui.h" 5 #include "chrome/browser/dom_ui/filebrowse_ui.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/string_piece.h" 11 #include "base/string_piece.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/thread.h" 13 #include "base/thread.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/bookmarks/bookmark_model.h" 16 #include "chrome/browser/bookmarks/bookmark_model.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/chrome_thread.h"
18 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" 18 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
19 #include "chrome/browser/metrics/user_metrics.h" 19 #include "chrome/browser/metrics/user_metrics.h"
20 #include "chrome/browser/history/history_types.h" 20 #include "chrome/browser/history/history_types.h"
21 #include "chrome/browser/profile.h" 21 #include "chrome/browser/profile.h"
22 #include "chrome/common/jstemplate_builder.h" 22 #include "chrome/common/jstemplate_builder.h"
23 #include "chrome/common/time_format.h" 23 #include "chrome/common/time_format.h"
24 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
25 #include "net/base/escape.h" 25 #include "net/base/escape.h"
26 26
27 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 FileBrowseHandler::~FileBrowseHandler() { 126 FileBrowseHandler::~FileBrowseHandler() {
127 // TODO: Cancel any pending listings that are currently in flight. 127 // TODO: Cancel any pending listings that are currently in flight.
128 if (lister_.get()) { 128 if (lister_.get()) {
129 lister_->Cancel(); 129 lister_->Cancel();
130 lister_->set_delegate(NULL); 130 lister_->set_delegate(NULL);
131 } 131 }
132 } 132 }
133 133
134 DOMMessageHandler* FileBrowseHandler::Attach(DOMUI* dom_ui) { 134 DOMMessageHandler* FileBrowseHandler::Attach(DOMUI* dom_ui) {
135 // Create our favicon data source. 135 // Create our favicon data source.
136 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, 136 ChromeThread::PostTask(
137 NewRunnableMethod(&chrome_url_data_manager, 137 ChromeThread::IO, FROM_HERE,
138 &ChromeURLDataManager::AddDataSource, 138 NewRunnableMethod(
139 new DOMUIFavIconSource(dom_ui->GetProfile()))); 139 &chrome_url_data_manager,
140 &ChromeURLDataManager::AddDataSource,
141 new DOMUIFavIconSource(dom_ui->GetProfile())));
140 142
141 return DOMMessageHandler::Attach(dom_ui); 143 return DOMMessageHandler::Attach(dom_ui);
142 } 144 }
143 145
144 void FileBrowseHandler::RegisterMessages() { 146 void FileBrowseHandler::RegisterMessages() {
145 dom_ui_->RegisterMessageCallback("getRoots", 147 dom_ui_->RegisterMessageCallback("getRoots",
146 NewCallback(this, &FileBrowseHandler::HandleGetRoots)); 148 NewCallback(this, &FileBrowseHandler::HandleGetRoots));
147 dom_ui_->RegisterMessageCallback("getChildren", 149 dom_ui_->RegisterMessageCallback("getChildren",
148 NewCallback(this, &FileBrowseHandler::HandleGetChildren)); 150 NewCallback(this, &FileBrowseHandler::HandleGetChildren));
149 dom_ui_->RegisterMessageCallback("getMetadata", 151 dom_ui_->RegisterMessageCallback("getMetadata",
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 // FileBrowseUIContents 243 // FileBrowseUIContents
242 // 244 //
243 //////////////////////////////////////////////////////////////////////////////// 245 ////////////////////////////////////////////////////////////////////////////////
244 246
245 FileBrowseUI::FileBrowseUI(TabContents* contents) : DOMUI(contents) { 247 FileBrowseUI::FileBrowseUI(TabContents* contents) : DOMUI(contents) {
246 AddMessageHandler((new FileBrowseHandler())->Attach(this)); 248 AddMessageHandler((new FileBrowseHandler())->Attach(this));
247 DLOG(ERROR) << "Got call to filebrowseUI"; 249 DLOG(ERROR) << "Got call to filebrowseUI";
248 FileBrowseUIHTMLSource* html_source = new FileBrowseUIHTMLSource(); 250 FileBrowseUIHTMLSource* html_source = new FileBrowseUIHTMLSource();
249 251
250 // Set up the chrome://filebrowse/ source. 252 // Set up the chrome://filebrowse/ source.
251 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, 253 ChromeThread::PostTask(
252 NewRunnableMethod(&chrome_url_data_manager, 254 ChromeThread::IO, FROM_HERE,
255 NewRunnableMethod(
256 &chrome_url_data_manager,
253 &ChromeURLDataManager::AddDataSource, 257 &ChromeURLDataManager::AddDataSource,
254 html_source)); 258 html_source));
255 } 259 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698