Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(478)

Unified Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/render_view_context_menu.cc
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 6f225413ed80f1bf4841bb6c7418654902b27e59..933c1753391f2dc38b1ffa29a6872e0331c80e02 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -1049,10 +1049,10 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
IncognitoModePrefs::GetAvailability(profile_->GetPrefs());
switch (id) {
case IDC_BACK:
- return source_tab_contents_->GetController().CanGoBack();
+ return source_tab_contents_->controller().CanGoBack();
case IDC_FORWARD:
- return source_tab_contents_->GetController().CanGoForward();
+ return source_tab_contents_->controller().CanGoForward();
case IDC_RELOAD:
return source_tab_contents_->GetDelegate() &&
@@ -1061,13 +1061,13 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
case IDC_VIEW_SOURCE:
case IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE:
- return source_tab_contents_->GetController().CanViewSource();
+ return source_tab_contents_->controller().CanViewSource();
case IDC_CONTENT_CONTEXT_INSPECTELEMENT:
return IsDevCommandEnabled(id);
case IDC_CONTENT_CONTEXT_VIEWPAGEINFO:
- return source_tab_contents_->GetController().GetActiveEntry() != NULL;
+ return source_tab_contents_->controller().GetActiveEntry() != NULL;
case IDC_CONTENT_CONTEXT_TRANSLATE: {
TabContentsWrapper* tab_contents_wrapper =
@@ -1193,7 +1193,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
// rather than the display one (returned by GetURL) which may be
// different (like having "view-source:" on the front).
NavigationEntry* active_entry =
- source_tab_contents_->GetController().GetActiveEntry();
+ source_tab_contents_->controller().GetActiveEntry();
return SavePackage::IsSavableURL(
(active_entry) ? active_entry->url() : GURL());
}
@@ -1521,11 +1521,11 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
break;
case IDC_BACK:
- source_tab_contents_->GetController().GoBack();
+ source_tab_contents_->controller().GoBack();
break;
case IDC_FORWARD:
- source_tab_contents_->GetController().GoForward();
+ source_tab_contents_->controller().GoForward();
break;
case IDC_SAVE_PAGE:
@@ -1535,7 +1535,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
case IDC_RELOAD:
// Prevent the modal "Resubmit form post" dialog from appearing in the
// context of an external context menu.
- source_tab_contents_->GetController().Reload(!external_);
+ source_tab_contents_->controller().Reload(!external_);
break;
case IDC_PRINT:
@@ -1564,7 +1564,7 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
case IDC_CONTENT_CONTEXT_VIEWPAGEINFO: {
NavigationEntry* nav_entry =
- source_tab_contents_->GetController().GetActiveEntry();
+ source_tab_contents_->controller().GetActiveEntry();
source_tab_contents_->ShowPageInfo(nav_entry->url(), nav_entry->ssl(),
true);
break;

Powered by Google App Engine
This is Rietveld 408576698