| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu
_views.h" | 5 #include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu
_views.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 using content::WebContents; | 27 using content::WebContents; |
| 28 | 28 |
| 29 //////////////////////////////////////////////////////////////////////////////// | 29 //////////////////////////////////////////////////////////////////////////////// |
| 30 // RenderViewContextMenuViews, public: | 30 // RenderViewContextMenuViews, public: |
| 31 | 31 |
| 32 RenderViewContextMenuViews::RenderViewContextMenuViews( | 32 RenderViewContextMenuViews::RenderViewContextMenuViews( |
| 33 content::RenderFrameHost* render_frame_host, | 33 content::RenderFrameHost* render_frame_host, |
| 34 const content::ContextMenuParams& params) | 34 const content::ContextMenuParams& params) |
| 35 : RenderViewContextMenu(render_frame_host, params), | 35 : RenderViewContextMenu(render_frame_host, params), |
| 36 bidi_submenu_model_(this) { | 36 bidi_submenu_model_(this) { |
| 37 scoped_ptr<ToolkitDelegate> delegate(new ToolkitDelegateViews); | 37 std::unique_ptr<ToolkitDelegate> delegate(new ToolkitDelegateViews); |
| 38 set_toolkit_delegate(std::move(delegate)); | 38 set_toolkit_delegate(std::move(delegate)); |
| 39 } | 39 } |
| 40 | 40 |
| 41 RenderViewContextMenuViews::~RenderViewContextMenuViews() { | 41 RenderViewContextMenuViews::~RenderViewContextMenuViews() { |
| 42 } | 42 } |
| 43 | 43 |
| 44 // static | 44 // static |
| 45 RenderViewContextMenuViews* RenderViewContextMenuViews::Create( | 45 RenderViewContextMenuViews* RenderViewContextMenuViews::Create( |
| 46 content::RenderFrameHost* render_frame_host, | 46 content::RenderFrameHost* render_frame_host, |
| 47 const content::ContextMenuParams& params) { | 47 const content::ContextMenuParams& params) { |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 WebContents::FromRenderFrameHost(GetRenderFrameHost()); | 258 WebContents::FromRenderFrameHost(GetRenderFrameHost()); |
| 259 if (!web_contents) { | 259 if (!web_contents) { |
| 260 LOG(ERROR) << "RenderViewContextMenuViews::Show, couldn't find WebContents"; | 260 LOG(ERROR) << "RenderViewContextMenuViews::Show, couldn't find WebContents"; |
| 261 return NULL; | 261 return NULL; |
| 262 } | 262 } |
| 263 return web_contents->GetFullscreenRenderWidgetHostView() | 263 return web_contents->GetFullscreenRenderWidgetHostView() |
| 264 ? web_contents->GetFullscreenRenderWidgetHostView() | 264 ? web_contents->GetFullscreenRenderWidgetHostView() |
| 265 ->GetNativeView() | 265 ->GetNativeView() |
| 266 : web_contents->GetNativeView(); | 266 : web_contents->GetNativeView(); |
| 267 } | 267 } |
| OLD | NEW |