summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 20:07:36 +0000
committerglen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 20:07:36 +0000
commit648ddc1f6675caf7f580918ccd411676bf6cc7bc (patch)
treeb8cc6fe82c4a5b370e426582c7ad735b5227d1f7
parent46a6b528816b1c9c540f976998864891874b2a40 (diff)
downloadchromium_src-648ddc1f6675caf7f580918ccd411676bf6cc7bc.zip
chromium_src-648ddc1f6675caf7f580918ccd411676bf6cc7bc.tar.gz
chromium_src-648ddc1f6675caf7f580918ccd411676bf6cc7bc.tar.bz2
Apply the already-reviewed <http://codereview.chromium.org/2936> by developer0420.
I updated it to always have reload enabled, as you sometimes want to reload while a page is loading. BUG=204 TBR=ben Review URL: http://codereview.chromium.org/8016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3754 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/render_view_context_menu.cc1
-rw-r--r--chrome/browser/render_view_context_menu_controller.cc6
3 files changed, 10 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1b5c699..e1dbcea 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -240,6 +240,9 @@ each locale. -->
<message name="IDS_CONTENT_CONTEXT_INSPECTELEMENT" desc="The name of the Inspect Element command in the content area context menu">
I&amp;nspect element
</message>
+ <message name="IDS_CONTENT_CONTEXT_RELOAD" desc="The name of the Reload command in the content area context menu">
+ Re&amp;load
+ </message>
<message name="IDS_CONTENT_CONTEXT_OPENFRAMENEWWINDOW" desc="The name of the Open Frame in New Window command in the content area context menu">
Open frame in new &amp;window
diff --git a/chrome/browser/render_view_context_menu.cc b/chrome/browser/render_view_context_menu.cc
index 96a584c..105d6d8 100644
--- a/chrome/browser/render_view_context_menu.cc
+++ b/chrome/browser/render_view_context_menu.cc
@@ -84,6 +84,7 @@ void RenderViewContextMenu::AppendImageItems() {
void RenderViewContextMenu::AppendPageItems() {
AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_BACK);
AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_FORWARD);
+ AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_RELOAD);
AppendSeparator();
AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_SAVEPAGEAS);
AppendDelegateMenuItem(IDS_CONTENT_CONTEXT_PRINT);
diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc
index b8eb31f..2cd6abb 100644
--- a/chrome/browser/render_view_context_menu_controller.cc
+++ b/chrome/browser/render_view_context_menu_controller.cc
@@ -106,6 +106,8 @@ bool RenderViewContextMenuController::IsCommandEnabled(int id) const {
case IDS_CONTENT_CONTEXT_FORWARD:
return source_web_contents_->controller()->CanGoForward();
+ case IDS_CONTENT_CONTEXT_RELOAD:
+ return true;
case IDS_CONTENT_CONTEXT_VIEWPAGESOURCE:
case IDS_CONTENT_CONTEXT_VIEWFRAMESOURCE:
case IDS_CONTENT_CONTEXT_INSPECTELEMENT:
@@ -273,6 +275,10 @@ void RenderViewContextMenuController::ExecuteCommand(int id) {
source_web_contents_->OnSavePage();
break;
+ case IDS_CONTENT_CONTEXT_RELOAD:
+ source_web_contents_->controller()->Reload();
+ break;
+
case IDS_CONTENT_CONTEXT_PRINT:
source_web_contents_->PrintPreview();
break;