diff options
author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 20:04:05 +0000 |
---|---|---|
committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 20:04:05 +0000 |
commit | 070105a896b3a37936537d0a6ead077569e866ff (patch) | |
tree | e75076b87f2abb3f6d4278d5e13b310d3eb4a457 | |
parent | 7ee62626cfe9952c2e2c7f34f91f128b1cea8835 (diff) | |
download | chromium_src-070105a896b3a37936537d0a6ead077569e866ff.zip chromium_src-070105a896b3a37936537d0a6ead077569e866ff.tar.gz chromium_src-070105a896b3a37936537d0a6ead077569e866ff.tar.bz2 |
Made chrome: schema savable. Reenabled print context menu that was previously disabled in ChromeOS.
BUG=chrome-os:4073
TEST=open about:system, right mouse click and pick Save As menu item
Review URL: http://codereview.chromium.org/2880009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51998 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 5 | ||||
-rw-r--r-- | chrome/browser/views/bug_report_view.cc | 5 | ||||
-rw-r--r-- | chrome/common/url_constants.cc | 2 | ||||
-rw-r--r-- | chrome/common/url_constants.h | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 0ac2764..101d43f 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -843,12 +843,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const { case IDC_SPELLCHECK_ADD_TO_DICTIONARY: return !params_.misspelled_word.empty(); -#if defined(OS_CHROMEOS) case IDC_PRINT: - return false; -#else - case IDC_PRINT: -#endif case IDC_CONTENT_CONTEXT_SEARCHWEBFOR: case IDC_CONTENT_CONTEXT_GOTOURL: case IDC_SPELLCHECK_SUGGESTION_0: diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 8fd5949..564b080 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -25,6 +25,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/pref_names.h" +#include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -56,8 +57,6 @@ static const int kBugReportVersion = 1; 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; @@ -608,7 +607,7 @@ void BugReportView::LinkActivated(views::Link* source, int event_flags) { GURL url; if (source == system_information_url_control_) { - url = GURL(kSystemInformationUrl); + url = GURL(chrome::kAboutSystemURL); } else { NOTREACHED() << "Unknown link source"; return; diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 4c8b12e..ec85309 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -37,6 +37,7 @@ const char* kSavableSchemes[] = { kFileScheme, kFtpScheme, kExtensionScheme, + kChromeUIScheme, NULL }; @@ -50,6 +51,7 @@ const char kAboutMemoryURL[] = "about:memory"; const char kAboutNetInternalsURL[] = "about:net-internals"; const char kAboutPluginsURL[] = "about:plugins"; const char kAboutShorthangURL[] = "about:shorthang"; +const char kAboutSystemURL[] = "about:system"; const char kAboutTermsURL[] = "about:terms"; const char kAboutAboutURL[] = "about:about"; const char kAboutDNSURL[] = "about:dns"; diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index c0e8d87..24cd3b0 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -45,6 +45,7 @@ extern const char kAboutHangURL[]; extern const char kAboutMemoryURL[]; extern const char kAboutPluginsURL[]; extern const char kAboutShorthangURL[]; +extern const char kAboutSystemURL[]; extern const char kAboutTermsURL[]; extern const char kAboutAboutURL[]; extern const char kAboutDNSURL[]; |