Attempt 3 at: Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/chromeos/dom_ui/network_menu_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h"
 
 #include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
 #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_theme_source.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/menu/menu_2.h"
 
 namespace {
 
@@ skipping 84 matching lines @@
         ALLOW_THIS_IN_INITIALIZER_LIST(
             CreateMenuUIHTMLSource(new NetworkMenuSourceDelegate(),
                                    chrome::kChromeUINetworkMenu,
                                    "NetworkMenu",
                                    IDR_NETWORK_MENU_JS,
                                    IDR_NETWORK_MENU_CSS))) {
   NetworkMenuHandler* handler = new NetworkMenuHandler();
   AddMessageHandler((handler)->Attach(this));
 
   // Set up chrome://theme/ source.
-  WebUIThemeSource* theme = new WebUIThemeSource(GetProfile());
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(
-          ChromeURLDataManager::GetInstance(),
-          &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(theme)));
+  WebUIThemeSource* theme = new WebUIThemeSource(contents->profile());
+  contents->profile()->GetChromeURLDataManager()->AddDataSource(theme);
 }
 
 bool NetworkMenuUI::ModelAction(const ui::MenuModel* model,
                                 const ListValue* values) {
   const NetworkMenu* network_menu = static_cast<const NetworkMenu*>(model);
   std::string action;
   bool success = values->GetString(0, &action);
   bool close_menu = true;
   if (!success) {
     LOG(WARNING) << "ModelAction called with no arguments from: "
@@ skipping 56 matching lines @@
 }
 
 views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) {
   views::Menu2* menu = new views::Menu2(model);
   NativeMenuWebUI::SetMenuURL(
       menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));
   return menu;
 }
 
 }  // namespace chromeos