chrome/browser/ui/webui/media/media_internals_ui.cc - Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/media/media_internals_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: Added static convenience method to ChromeURLDataManager, fixed style issues 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

« chrome/browser/ui/webui/chrome_url_data_manager.cc ('K') | « chrome/browser/ui/webui/keyboard_ui.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/media/media_internals_ui.h"	5 #include "chrome/browser/ui/webui/media/media_internals_ui.h"

6	6

7 #include "base/values.h"	7 #include "base/values.h"

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	9 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

10 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	10 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
	Evan Stade 2012/04/24 21:22:14 this change should now be reverted this change should now be reverted Kyle Horimoto 2012/04/24 22:17:49 Done. Show quoted text On 2012/04/24 21:22:14, Evan Stade wrote: > this change should now be reverted Done.
11 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"	11 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

12 #include "chrome/browser/ui/webui/media/media_internals_handler.h"	12 #include "chrome/browser/ui/webui/media/media_internals_handler.h"

13 #include "chrome/common/jstemplate_builder.h"	13 #include "chrome/common/jstemplate_builder.h"

14 #include "chrome/common/url_constants.h"	14 #include "chrome/common/url_constants.h"

15 #include "content/public/browser/web_contents.h"	15 #include "content/public/browser/web_contents.h"

16 #include "content/public/browser/web_ui.h"	16 #include "content/public/browser/web_ui.h"

17 #include "grit/browser_resources.h"	17 #include "grit/browser_resources.h"

18 #include "ui/base/resource/resource_bundle.h"	18 #include "ui/base/resource/resource_bundle.h"

19	19

20 using content::WebContents;	20 using content::WebContents;

(...skipping 16 matching lines...) Expand all Loading...
37 //	37 //

38 // MediaInternalsUI	38 // MediaInternalsUI

39 //	39 //

40 ////////////////////////////////////////////////////////////////////////////////	40 ////////////////////////////////////////////////////////////////////////////////

41	41

42 MediaInternalsUI::MediaInternalsUI(content::WebUI* web_ui)	42 MediaInternalsUI::MediaInternalsUI(content::WebUI* web_ui)

43 : WebUIController(web_ui) {	43 : WebUIController(web_ui) {

44 web_ui->AddMessageHandler(new MediaInternalsMessageHandler());	44 web_ui->AddMessageHandler(new MediaInternalsMessageHandler());

45	45

46 Profile* profile = Profile::FromWebUI(web_ui);	46 Profile* profile = Profile::FromWebUI(web_ui);

47 profile->GetChromeURLDataManager()->AddDataSource(	47 ChromeURLDataManager::AddDataSource(profile,

48 CreateMediaInternalsHTMLSource());	48 CreateMediaInternalsHTMLSource());

49 }	49 }

OLD	NEW