summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 12:33:29 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 12:33:29 +0000
commite4c72f2ba72f31b1179edaa13a147e9f61899394 (patch)
treebc515e6442870942ec9a3c6cb329976f7e46ffb3
parent75c93d6a708a74e7dc5ab51b6be2e22f7febf8d3 (diff)
downloadchromium_src-e4c72f2ba72f31b1179edaa13a147e9f61899394.zip
chromium_src-e4c72f2ba72f31b1179edaa13a147e9f61899394.tar.gz
chromium_src-e4c72f2ba72f31b1179edaa13a147e9f61899394.tar.bz2
Doing this to see if it fixes some failing tests that started about when this landed.
Revert 49031 - Ensure that the context menu items displayed in ChromeFrame rendered pages are enabled/disabled correctly. To achieve this we now have a UpdateMenuItemStates function in the RenderViewContextMenuViews class which calls into the underlying menu's UpdateStates function which enables/disables items correctly. Fixes bug http://code.google.com/p/chromium/issues/detail?id=45785 Bug=45785 Review URL: http://codereview.chromium.org/2627005 TBR=ananta@chromium.org Review URL: http://codereview.chromium.org/2768001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49162 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/external_tab_container.cc1
-rw-r--r--chrome/browser/views/tab_contents/render_view_context_menu_views.cc4
-rw-r--r--chrome/browser/views/tab_contents/render_view_context_menu_views.h2
3 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 5fd672b..2e39a76 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -525,7 +525,6 @@ bool ExternalTabContainer::HandleContextMenu(const ContextMenuParams& params) {
new RenderViewContextMenuViews(tab_contents(), params));
external_context_menu_->SetExternal();
external_context_menu_->Init();
- external_context_menu_->UpdateMenuItemStates();
POINT screen_pt = { params.x, params.y };
MapWindowPoints(GetNativeView(), HWND_DESKTOP, &screen_pt, 1);
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
index 3fb8f28..e719e0b 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
@@ -35,10 +35,6 @@ void RenderViewContextMenuViews::SetExternal() {
}
#endif
-void RenderViewContextMenuViews::UpdateMenuItemStates() {
- menu_->UpdateStates();
-}
-
////////////////////////////////////////////////////////////////////////////////
// RenderViewContextMenuViews, protected:
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.h b/chrome/browser/views/tab_contents/render_view_context_menu_views.h
index cb58698..1203d4f 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_views.h
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_views.h
@@ -30,8 +30,6 @@ class RenderViewContextMenuViews : public RenderViewContextMenu {
void SetExternal();
#endif
- void UpdateMenuItemStates();
-
protected:
// RenderViewContextMenu implementation --------------------------------------
virtual void PlatformInit();