diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 23:18:55 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 23:18:55 +0000 |
| commit | 9c0a58008e54678318d98d0a519bd47e9bd84f07 (patch) | |
| tree | 129b3e7cc2e1acd4914e4856eb7b2e9a8f819e8b /chrome/browser/dom_ui | |
| parent | 4f871d502565af559f434fca4decc00363af5bc3 (diff) | |
| download | chromium_src-9c0a58008e54678318d98d0a519bd47e9bd84f07.zip chromium_src-9c0a58008e54678318d98d0a519bd47e9bd84f07.tar.gz chromium_src-9c0a58008e54678318d98d0a519bd47e9bd84f07.tar.bz2 | |
Bunch of bugreport fixes. Also, moved about:system page to chrome:system.
BUG=chromium-os:6737,chromium-os:6739,chromium-os:6547,chromium-os:6108
TEST=test the bugs above
Review URL: http://codereview.chromium.org/3417008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/bug_report_ui.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_factory.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc index 021ff9e..6fb0706 100644 --- a/chrome/browser/dom_ui/bug_report_ui.cc +++ b/chrome/browser/dom_ui/bug_report_ui.cc @@ -478,7 +478,7 @@ void BugReportHandler::HandleGetDialogDefaults(const ListValue*) { #if defined(OS_CHROMEOS) // 1: user e-mail sys_info_ = GetSystemInformation(); - dialog_defaults.Append(new StringValue(chrome::kAboutSystemURL)); + dialog_defaults.Append(new StringValue(chrome::kChromeUISystemInfoURL)); // 2: user e-mail dialog_defaults.Append(new StringValue(GetUserEmail())); diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc index 2e86f77..d649e45 100644 --- a/chrome/browser/dom_ui/dom_ui_factory.cc +++ b/chrome/browser/dom_ui/dom_ui_factory.cc @@ -37,6 +37,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/dom_ui/imageburner_ui.h" +#include "chrome/browser/chromeos/dom_ui/system_info_ui.h" #include "chrome/browser/dom_ui/filebrowse_ui.h" #include "chrome/browser/dom_ui/mediaplayer_ui.h" #include "chrome/browser/dom_ui/register_page_ui.h" @@ -154,6 +155,8 @@ static DOMUIFactoryFunction GetDOMUIFactoryFunction(Profile* profile, return &NewDOMUI<SlideshowUI>; if (url.host() == chrome::kChromeUIOptionsHost) return &NewDOMUI<OptionsUI>; + if (url.host() == chrome::kChromeUISystemInfoHost) + return &NewDOMUI<SystemInfoUI>; #else if (url.host() == chrome::kChromeUIOptionsHost) { if (CommandLine::ForCurrentProcess()->HasSwitch( |