OLD | NEW |
---|---|
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_delegate_mac.h" | 5 #import "chrome/browser/tab_contents/chrome_web_contents_view_delegate_mac.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" |
Avi (use Gerrit)
2012/04/17 16:33:46
This is no longer needed.
| |
11 #include "content/public/browser/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_delegate_mac { | 14 namespace chrome_web_contents_view_delegate_mac { |
15 content::WebContentsViewDelegate* CreateWebContentsViewDelegateMac( | 15 content::WebContentsViewDelegate* CreateWebContentsViewDelegateMac( |
16 content::WebContents* web_contents) { | 16 content::WebContents* web_contents) { |
17 return new ChromeWebContentsViewDelegateMac(web_contents); | 17 return new ChromeWebContentsViewDelegateMac(web_contents); |
18 } | 18 } |
19 } | 19 } |
20 | 20 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 if (widget_view && widget_view->IsShowingContextMenu()) | 53 if (widget_view && widget_view->IsShowingContextMenu()) |
54 return; | 54 return; |
55 | 55 |
56 context_menu_.reset( | 56 context_menu_.reset( |
57 new RenderViewContextMenuMac(web_contents_, | 57 new RenderViewContextMenuMac(web_contents_, |
58 params, | 58 params, |
59 web_contents_->GetContentNativeView())); | 59 web_contents_->GetContentNativeView())); |
60 context_menu_->Init(); | 60 context_menu_->Init(); |
61 } | 61 } |
62 | 62 |
63 void ChromeWebContentsViewDelegateMac::NativeViewCreated(NSView* view) { | 63 void ChromeWebContentsViewDelegateMac::NativeViewCreated(NSView* view) { |
Avi (use Gerrit)
2012/04/17 16:33:46
Without the view_id calls, there's no point to the
| |
64 view_id_util::SetID(view, VIEW_ID_TAB_CONTAINER); | |
65 } | 64 } |
66 | 65 |
67 void ChromeWebContentsViewDelegateMac::NativeViewDestroyed(NSView* view) { | 66 void ChromeWebContentsViewDelegateMac::NativeViewDestroyed(NSView* view) { |
68 view_id_util::UnsetID(view); | |
69 } | 67 } |
OLD | NEW |