| 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 "extensions/browser/guest_view/web_view/web_view_guest.h" | 5 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1133 } | 1133 } |
| 1134 | 1134 |
| 1135 // Only read the src attribute if this is not a New Window API flow. | 1135 // Only read the src attribute if this is not a New Window API flow. |
| 1136 if (!is_pending_new_window) { | 1136 if (!is_pending_new_window) { |
| 1137 std::string src; | 1137 std::string src; |
| 1138 if (params.GetString(webview::kAttributeSrc, &src)) | 1138 if (params.GetString(webview::kAttributeSrc, &src)) |
| 1139 NavigateGuest(src, true /* force_navigation */); | 1139 NavigateGuest(src, true /* force_navigation */); |
| 1140 } | 1140 } |
| 1141 } | 1141 } |
| 1142 | 1142 |
| 1143 void WebViewGuest::ShowContextMenu( | 1143 void WebViewGuest::ShowContextMenu(int request_id) { |
| 1144 int request_id, | |
| 1145 const WebViewGuestDelegate::MenuItemVector* items) { | |
| 1146 if (web_view_guest_delegate_) | 1144 if (web_view_guest_delegate_) |
| 1147 web_view_guest_delegate_->OnShowContextMenu(request_id, items); | 1145 web_view_guest_delegate_->OnShowContextMenu(request_id); |
| 1148 } | 1146 } |
| 1149 | 1147 |
| 1150 void WebViewGuest::SetName(const std::string& name) { | 1148 void WebViewGuest::SetName(const std::string& name) { |
| 1151 if (name_ == name) | 1149 if (name_ == name) |
| 1152 return; | 1150 return; |
| 1153 name_ = name; | 1151 name_ = name; |
| 1154 | 1152 |
| 1155 Send(new ExtensionMsg_SetFrameName(routing_id(), name_)); | 1153 Send(new ExtensionMsg_SetFrameName(routing_id(), name_)); |
| 1156 } | 1154 } |
| 1157 | 1155 |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1500 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 1498 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
| 1501 DispatchEventToView( | 1499 DispatchEventToView( |
| 1502 new GuestViewEvent(webview::kEventExitFullscreen, std::move(args))); | 1500 new GuestViewEvent(webview::kEventExitFullscreen, std::move(args))); |
| 1503 } | 1501 } |
| 1504 // Since we changed fullscreen state, sending a Resize message ensures that | 1502 // Since we changed fullscreen state, sending a Resize message ensures that |
| 1505 // renderer/ sees the change. | 1503 // renderer/ sees the change. |
| 1506 web_contents()->GetRenderViewHost()->GetWidget()->WasResized(); | 1504 web_contents()->GetRenderViewHost()->GetWidget()->WasResized(); |
| 1507 } | 1505 } |
| 1508 | 1506 |
| 1509 } // namespace extensions | 1507 } // namespace extensions |
| OLD | NEW |