From b731a1476cd4a9380902463e467bfdcc0c2a9cca Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Fri, 14 May 2010 00:03:03 +0000 Subject: Fix the chrome frame context menu back forward test which regressed in revision 47187 due to a change in the context menu resource ids. Solution is to include the chrome_dll_resources.h file in a way to reduce conflicts with existing chrome frame resources. We have two new files chrome_imported_resources.cc/.h to achieve that. Fixes bug http://code.google.com/p/chromium/issues/detail?id=44134 Bug=44134 Review URL: http://codereview.chromium.org/2067006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47223 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_active_document.cc | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'chrome_frame/chrome_active_document.cc') diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 9403e41..19a42a8 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -37,6 +37,7 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome_frame/bho.h" #include "chrome_frame/bind_context_info.h" +#include "chrome_frame/chrome_imported_resources.h" #include "chrome_frame/utils.h" const wchar_t kChromeAttachExternalTabPrefix[] = L"attach_external_tab"; @@ -870,21 +871,14 @@ bool ChromeActiveDocument::HandleContextMenuCommand(UINT cmd, ScopedComPtr web_browser2; DoQueryService(SID_SWebBrowserApp, m_spClientSite, web_browser2.Receive()); - switch (cmd) { - case IDS_CONTENT_CONTEXT_BACK: - web_browser2->GoBack(); - break; - - case IDS_CONTENT_CONTEXT_FORWARD: - web_browser2->GoForward(); - break; - - case IDS_CONTENT_CONTEXT_RELOAD: - web_browser2->Refresh(); - break; - - default: - return BaseActiveX::HandleContextMenuCommand(cmd, params); + if (cmd == context_menu_IDC_BACK) { + web_browser2->GoBack(); + } else if (cmd == context_menu_IDC_FORWARD) { + web_browser2->GoForward(); + } else if (cmd == context_menu_IDC_RELOAD) { + web_browser2->Refresh(); + } else { + return BaseActiveX::HandleContextMenuCommand(cmd, params); } return true; -- cgit v1.1