| Index: content/browser/media/media_internals_ui.cc
|
| ===================================================================
|
| --- content/browser/media/media_internals_ui.cc (revision 179909)
|
| +++ content/browser/media/media_internals_ui.cc (working copy)
|
| @@ -2,25 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/ui/webui/media/media_internals_ui.h"
|
| +#include "content/browser/media/media_internals_ui.h"
|
|
|
| -#include "base/values.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/webui/media/media_internals_handler.h"
|
| -#include "chrome/common/url_constants.h"
|
| +#include "content/browser/media/media_internals_handler.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_ui.h"
|
| #include "content/public/browser/web_ui_data_source.h"
|
| -#include "grit/browser_resources.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| +#include "content/public/common/url_constants.h"
|
| +#include "grit/content_resources.h"
|
|
|
| -using content::WebContents;
|
| -
|
| +namespace content {
|
| namespace {
|
|
|
| -content::WebUIDataSource* CreateMediaInternalsHTMLSource() {
|
| - content::WebUIDataSource* source =
|
| - content::WebUIDataSource::Create(chrome::kChromeUIMediaInternalsHost);
|
| +WebUIDataSource* CreateMediaInternalsHTMLSource() {
|
| + WebUIDataSource* source =
|
| + WebUIDataSource::Create(chrome::kChromeUIMediaInternalsHost);
|
|
|
| source->SetJsonPath("strings.js");
|
| source->AddResourcePath("media_internals.js", IDR_MEDIA_INTERNALS_JS);
|
| @@ -36,10 +32,13 @@
|
| //
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| -MediaInternalsUI::MediaInternalsUI(content::WebUI* web_ui)
|
| +MediaInternalsUI::MediaInternalsUI(WebUI* web_ui)
|
| : WebUIController(web_ui) {
|
| web_ui->AddMessageHandler(new MediaInternalsMessageHandler());
|
|
|
| - Profile* profile = Profile::FromWebUI(web_ui);
|
| - content::WebUIDataSource::Add(profile, CreateMediaInternalsHTMLSource());
|
| + BrowserContext* browser_context =
|
| + web_ui->GetWebContents()->GetBrowserContext();
|
| + WebUIDataSource::Add(browser_context, CreateMediaInternalsHTMLSource());
|
| }
|
| +
|
| +} // namespace content
|
|
|