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

Side by Side Diff: chrome/browser/ui/webui/devtools_ui.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/devtools_ui.h" 5 #include "chrome/browser/ui/webui/devtools_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "chrome/browser/net/chrome_url_request_context.h" 11 #include "chrome/browser/net/chrome_url_request_context.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 13 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/devtools_client_host.h" 16 #include "content/public/browser/devtools_client_host.h"
17 #include "content/public/browser/devtools_http_handler.h" 17 #include "content/public/browser/devtools_http_handler.h"
18 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
21 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
22 22
23 using content::BrowserThread; 23 using content::BrowserThread;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 NOTREACHED(); 85 NOTREACHED();
86 return "text/plain"; 86 return "text/plain";
87 } 87 }
88 88
89 // static 89 // static
90 void DevToolsUI::RegisterDevToolsDataSource(Profile* profile) { 90 void DevToolsUI::RegisterDevToolsDataSource(Profile* profile) {
91 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 91 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
92 static bool registered = false; 92 static bool registered = false;
93 if (!registered) { 93 if (!registered) {
94 DevToolsDataSource* data_source = new DevToolsDataSource(); 94 DevToolsDataSource* data_source = new DevToolsDataSource();
95 profile->GetChromeURLDataManager()->AddDataSource(data_source); 95 ChromeURLDataManagerFactory::GetForProfile(profile)->
96 AddDataSource(data_source);
96 registered = true; 97 registered = true;
97 } 98 }
98 } 99 }
99 100
100 DevToolsUI::DevToolsUI(content::WebUI* web_ui) : WebUIController(web_ui) { 101 DevToolsUI::DevToolsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
101 DevToolsDataSource* data_source = new DevToolsDataSource(); 102 DevToolsDataSource* data_source = new DevToolsDataSource();
102 Profile* profile = Profile::FromWebUI(web_ui); 103 Profile* profile = Profile::FromWebUI(web_ui);
103 profile->GetChromeURLDataManager()->AddDataSource(data_source); 104 ChromeURLDataManagerFactory::GetForProfile(profile)->
105 AddDataSource(data_source);
104 } 106 }
105 107
106 void DevToolsUI::RenderViewCreated( 108 void DevToolsUI::RenderViewCreated(
107 content::RenderViewHost* render_view_host) { 109 content::RenderViewHost* render_view_host) {
108 content::DevToolsClientHost::SetupDevToolsFrontendClient(render_view_host); 110 content::DevToolsClientHost::SetupDevToolsFrontendClient(render_view_host);
109 } 111 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698