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

Unified Diff: chrome/browser/chromeos/dom_ui/menu_ui.cc

Issue 6461024: Revert 74292 - Splits ChromeURLDataManager into 2 chunks:... (Closed) Base URL: svn://svn.chromium.org/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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/dom_ui/login/login_ui.cc ('k') | chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/dom_ui/menu_ui.cc
===================================================================
--- chrome/browser/chromeos/dom_ui/menu_ui.cc (revision 74293)
+++ chrome/browser/chromeos/dom_ui/menu_ui.cc (working copy)
@@ -20,7 +20,6 @@
#include "chrome/browser/chromeos/views/native_menu_webui.h"
#include "chrome/browser/chromeos/views/webui_menu_widget.h"
#include "chrome/browser/dom_ui/web_ui_util.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_delegate.h"
#include "chrome/common/url_constants.h"
@@ -532,8 +531,12 @@
MenuHandler* handler = new MenuHandler();
AddMessageHandler((handler)->Attach(this));
- contents->profile()->GetChromeURLDataManager()->AddDataSource(
- CreateDataSource());
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ NewRunnableMethod(
+ ChromeURLDataManager::GetInstance(),
+ &ChromeURLDataManager::AddDataSource,
+ make_scoped_refptr(CreateDataSource())));
}
MenuUI::MenuUI(TabContents* contents, ChromeURLDataManager::DataSource* source)
@@ -541,7 +544,12 @@
MenuHandler* handler = new MenuHandler();
AddMessageHandler((handler)->Attach(this));
- contents->profile()->GetChromeURLDataManager()->AddDataSource(source);
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ NewRunnableMethod(
+ ChromeURLDataManager::GetInstance(),
+ &ChromeURLDataManager::AddDataSource,
+ make_scoped_refptr(source)));
}
void MenuUI::ModelUpdated(const ui::MenuModel* model) {
« no previous file with comments | « chrome/browser/chromeos/dom_ui/login/login_ui.cc ('k') | chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698