summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 22:37:33 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 22:37:33 +0000
commit1fd7f9bc5be6ace6e57d2ada8f065e2736b7b3ec (patch)
tree1cf4c13da47799aa186ff25524079bc47612698e
parent77bd1d1d385634e3c112e79c1f2e6f1e3bf68ec5 (diff)
downloadchromium_src-1fd7f9bc5be6ace6e57d2ada8f065e2736b7b3ec.zip
chromium_src-1fd7f9bc5be6ace6e57d2ada8f065e2736b7b3ec.tar.gz
chromium_src-1fd7f9bc5be6ace6e57d2ada8f065e2736b7b3ec.tar.bz2
Redirected system info link from the user feedback dialog to about:system instead of the temp file.
BUG=chromium-os:3947 TEST=open user feedback dialog in ChromeOS, click on 'Included system information...' link, should open about:system page Review URL: http://codereview.chromium.org/2763002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49196 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/views/bug_report_view.cc10
-rw-r--r--chrome/browser/views/bug_report_view.h1
2 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index 3d2679a..8fd5949 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -57,7 +57,7 @@ static const int kScreenImageRadioGroup = 2;
static const char kScreenshotsRelativePath[] = "/Screenshots";
static const char kScreenshotPattern[] = "*.png";
static const char kAboutBlank[] = "about:blank";
-
+static const char kSystemInformationUrl[] = "about:system";
// Number of lines description field can display at one time.
static const int kDescriptionLines = 5;
@@ -293,12 +293,6 @@ BugReportView::BugReportView(Profile* profile, TabContents* tab)
chromeos::CrosLibrary::Get()->GetSyslogsLibrary();
if (syslogs_lib) {
sys_info_.reset(syslogs_lib->GetSyslogs(&tmpfilename));
- if (sys_info_.get())
- system_information_url_ = std::string("file://") + tmpfilename.value();
- else
- system_information_url_ = std::string(kAboutBlank);
- } else {
- system_information_url_ = std::string(kAboutBlank);
}
#endif
}
@@ -614,7 +608,7 @@ void BugReportView::LinkActivated(views::Link* source,
int event_flags) {
GURL url;
if (source == system_information_url_control_) {
- url = GURL(system_information_url_);
+ url = GURL(kSystemInformationUrl);
} else {
NOTREACHED() << "Unknown link source";
return;
diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h
index 6debc55..feeb0f3 100644
--- a/chrome/browser/views/bug_report_view.h
+++ b/chrome/browser/views/bug_report_view.h
@@ -142,7 +142,6 @@ class BugReportView : public views::View,
views::RadioButton* include_no_screen_image_radio_;
views::Link* system_information_url_control_;
- std::string system_information_url_;
scoped_ptr<chromeos::LogDictionaryType> sys_info_;
scoped_ptr< std::vector<unsigned char> > last_image_;
#endif