summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 05:05:46 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 05:05:46 +0000
commit3358a3dc6df4a18cf36288b40c6777ed9fba4204 (patch)
tree4161b8ce1ae24ca3164690277518405e3db384db /chrome
parent0933ab808b0245878803552b9908c720b0faf1d1 (diff)
downloadchromium_src-3358a3dc6df4a18cf36288b40c6777ed9fba4204.zip
chromium_src-3358a3dc6df4a18cf36288b40c6777ed9fba4204.tar.gz
chromium_src-3358a3dc6df4a18cf36288b40c6777ed9fba4204.tar.bz2
Try to fix arm build.
TBR=ben git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/frame/browser_view.cc6
-rw-r--r--chrome/browser/chromeos/frame/browser_view.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index c9e3b88..26d8dea 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -305,9 +305,9 @@ void BrowserView::Paste() {
}
// views::ContextMenuController overrides.
-void BrowserView::ShowContextMenu(views::View* source,
- const gfx::Point& p,
- bool is_mouse_gesture) {
+void BrowserView::ShowContextMenuForView(views::View* source,
+ const gfx::Point& p,
+ bool is_mouse_gesture) {
// Only show context menu if point is in unobscured parts of browser, i.e.
// if NonClientHitTest returns :
// - HTCAPTION: in title bar or unobscured part of tabstrip
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h
index 8df86cd..0b91349 100644
--- a/chrome/browser/chromeos/frame/browser_view.h
+++ b/chrome/browser/chromeos/frame/browser_view.h
@@ -58,9 +58,9 @@ class BrowserView : public ::BrowserView,
virtual void Paste();
// views::ContextMenuController overrides.
- virtual void ShowContextMenu(views::View* source,
- const gfx::Point& p,
- bool is_mouse_gesture);
+ virtual void ShowContextMenuForView(views::View* source,
+ const gfx::Point& p,
+ bool is_mouse_gesture);
// views::MenuListener implementation.
virtual void OnMenuOpened();