chrome_frame/external_tab_test.cc - Issue 4194007: Revert "Refactor automation messages." due to mysterious problems on mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/external_tab_test.cc

Issue 4194007: Revert "Refactor automation messages." due to mysterious problems on mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 2 months 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_frame/external_tab_test.cc

diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc

index 1448c344e5d63a270ac7cce7305049711abe611c..0e49f956d9a8a62deda52618979786747bc01490 100644

--- a/chrome_frame/external_tab_test.cc

+++ b/chrome_frame/external_tab_test.cc

@@ -9,7 +9,7 @@

// #include "base/waitable_event.h"

-#include "chrome/common/automation_messages.h"

+#include "chrome/test/automation/automation_messages.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gmock_mutant.h"

@@ -41,7 +41,7 @@ struct MockUIDelegate : public UIDelegate {

MOCK_METHOD3(OnMessageFromChromeFrame, void(const std::string& message,

const std::string& origin, const std::string& target));

MOCK_METHOD3(OnHandleContextMenu, void(HANDLE menu_handle, int align_flags,

- const IPC::MiniContextMenuParams& params));

+ const IPC::ContextMenuParams& params));

MOCK_METHOD1(OnHandleAccelerator, void(const MSG& accel_message));

MOCK_METHOD1(OnTabbedOut, void(bool reverse));

MOCK_METHOD1(OnGoToHistoryOffset, void(int offset));

« no previous file with comments | « chrome_frame/external_tab.cc ('k') | chrome_frame/plugin_url_request.cc » ('j') | no next file with comments »