Chromium Code Reviews| Index: content/browser/media/media_internals_ui.cc |
| diff --git a/content/browser/media/media_internals_ui.cc b/content/browser/media/media_internals_ui.cc |
| index 812825d10fa340f42da923b074288c5e503b462c..8ec7f3bc7e346e9cd221a6ccd2ed3394ec667856 100644 |
| --- a/content/browser/media/media_internals_ui.cc |
| +++ b/content/browser/media/media_internals_ui.cc |
| @@ -4,10 +4,12 @@ |
| #include "content/browser/media/media_internals_ui.h" |
| +#include "base/command_line.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 "content/public/common/content_switches.h" |
| #include "content/public/common/url_constants.h" |
| #include "grit/content_resources.h" |
| @@ -19,8 +21,14 @@ WebUIDataSource* CreateMediaInternalsHTMLSource() { |
| WebUIDataSource::Create(kChromeUIMediaInternalsHost); |
| source->SetJsonPath("strings.js"); |
| - source->AddResourcePath("media_internals.js", IDR_MEDIA_INTERNALS_JS); |
| - source->SetDefaultResource(IDR_MEDIA_INTERNALS_HTML); |
| + if (CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kEnableNewMediaInternals)) { |
| + source->AddResourcePath("media_internals.js", IDR_MEDIA_INTERNALS_NEW_JS); |
| + source->SetDefaultResource(IDR_MEDIA_INTERNALS_NEW_HTML); |
|
scherkus (not reviewing)
2013/07/19 01:58:49
nit: return early here instead of sticking the oth
Ty Overby
2013/07/19 17:48:00
Done.
|
| + } else { |
| + source->AddResourcePath("media_internals.js", IDR_MEDIA_INTERNALS_JS); |
| + source->SetDefaultResource(IDR_MEDIA_INTERNALS_HTML); |
| + } |
| return source; |
| } |