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

Side by Side Diff: chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.mm

Issue 9420007: Move RenderWidgetHostView into content namespace. Fix include paths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_chromeos_gtk build issue not caught by trybots. Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h" 5 #import "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h"
6 6
7 #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegat e.h" 7 #import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegat e.h"
8 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h" 8 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h"
9 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h" 9 #include "chrome/browser/tab_contents/web_drag_bookmark_handler_mac.h"
10 #import "chrome/browser/ui/cocoa/view_id_util.h" 10 #import "chrome/browser/ui/cocoa/view_id_util.h"
11 #include "content/browser/renderer_host/render_widget_host_view.h" 11 #include "content/public/browser/render_widget_host_view.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 13
14 namespace chrome_web_contents_view_mac_delegate { 14 namespace chrome_web_contents_view_mac_delegate {
15 content::WebContentsViewMacDelegate* CreateWebContentsViewMacDelegate( 15 content::WebContentsViewMacDelegate* CreateWebContentsViewMacDelegate(
16 content::WebContents* web_contents) { 16 content::WebContents* web_contents) {
17 return new ChromeWebContentsViewMacDelegate(web_contents); 17 return new ChromeWebContentsViewMacDelegate(web_contents);
18 } 18 }
19 } 19 }
20 20
21 ChromeWebContentsViewMacDelegate::ChromeWebContentsViewMacDelegate( 21 ChromeWebContentsViewMacDelegate::ChromeWebContentsViewMacDelegate(
(...skipping 18 matching lines...) Expand all
40 40
41 void ChromeWebContentsViewMacDelegate::ShowContextMenu( 41 void ChromeWebContentsViewMacDelegate::ShowContextMenu(
42 const content::ContextMenuParams& params) { 42 const content::ContextMenuParams& params) {
43 // The renderer may send the "show context menu" message multiple times, one 43 // The renderer may send the "show context menu" message multiple times, one
44 // for each right click mouse event it receives. Normally, this doesn't happen 44 // for each right click mouse event it receives. Normally, this doesn't happen
45 // because mouse events are not forwarded once the context menu is showing. 45 // because mouse events are not forwarded once the context menu is showing.
46 // However, there's a race - the context menu may not yet be showing when 46 // However, there's a race - the context menu may not yet be showing when
47 // the second mouse event arrives. In this case, |ShowContextMenu()| will 47 // the second mouse event arrives. In this case, |ShowContextMenu()| will
48 // get called multiple times - if so, don't create another context menu. 48 // get called multiple times - if so, don't create another context menu.
49 // TODO(asvitkine): Fix the renderer so that it doesn't do this. 49 // TODO(asvitkine): Fix the renderer so that it doesn't do this.
50 RenderWidgetHostView* widget_view = web_contents_->GetRenderWidgetHostView(); 50 content::RenderWidgetHostView* widget_view =
51 web_contents_->GetRenderWidgetHostView();
51 if (widget_view && widget_view->IsShowingContextMenu()) 52 if (widget_view && widget_view->IsShowingContextMenu())
52 return; 53 return;
53 54
54 context_menu_.reset( 55 context_menu_.reset(
55 new RenderViewContextMenuMac(web_contents_, 56 new RenderViewContextMenuMac(web_contents_,
56 params, 57 params,
57 web_contents_->GetContentNativeView())); 58 web_contents_->GetContentNativeView()));
58 context_menu_->Init(); 59 context_menu_->Init();
59 } 60 }
60 61
61 void ChromeWebContentsViewMacDelegate::NativeViewCreated(NSView* view) { 62 void ChromeWebContentsViewMacDelegate::NativeViewCreated(NSView* view) {
62 view_id_util::SetID(view, VIEW_ID_TAB_CONTAINER); 63 view_id_util::SetID(view, VIEW_ID_TAB_CONTAINER);
63 } 64 }
64 65
65 void ChromeWebContentsViewMacDelegate::NativeViewDestroyed(NSView* view) { 66 void ChromeWebContentsViewMacDelegate::NativeViewDestroyed(NSView* view) {
66 view_id_util::UnsetID(view); 67 view_id_util::UnsetID(view);
67 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698