| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/renderer/render_view.h" | 5 #include "content/renderer/render_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1425 break; | 1425 break; |
| 1426 case WebConsoleMessage::LevelError: | 1426 case WebConsoleMessage::LevelError: |
| 1427 log_severity = logging::LOG_ERROR; | 1427 log_severity = logging::LOG_ERROR; |
| 1428 break; | 1428 break; |
| 1429 default: | 1429 default: |
| 1430 NOTREACHED(); | 1430 NOTREACHED(); |
| 1431 } | 1431 } |
| 1432 | 1432 |
| 1433 Send(new ViewHostMsg_AddMessageToConsole(routing_id_, | 1433 Send(new ViewHostMsg_AddMessageToConsole(routing_id_, |
| 1434 static_cast<int32>(log_severity), | 1434 static_cast<int32>(log_severity), |
| 1435 UTF16ToWideHack(message.text), | 1435 message.text, |
| 1436 static_cast<int32>(source_line), | 1436 static_cast<int32>(source_line), |
| 1437 UTF16ToWideHack(source_name))); | 1437 source_name)); |
| 1438 } | 1438 } |
| 1439 | 1439 |
| 1440 void RenderView::printPage(WebFrame* frame) { | 1440 void RenderView::printPage(WebFrame* frame) { |
| 1441 FOR_EACH_OBSERVER(RenderViewObserver, observers_, PrintPage(frame)); | 1441 FOR_EACH_OBSERVER(RenderViewObserver, observers_, PrintPage(frame)); |
| 1442 } | 1442 } |
| 1443 | 1443 |
| 1444 WebKit::WebNotificationPresenter* RenderView::notificationPresenter() { | 1444 WebKit::WebNotificationPresenter* RenderView::notificationPresenter() { |
| 1445 return notification_provider_; | 1445 return notification_provider_; |
| 1446 } | 1446 } |
| 1447 | 1447 |
| (...skipping 2981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4429 } | 4429 } |
| 4430 #endif | 4430 #endif |
| 4431 | 4431 |
| 4432 void RenderView::OnContextMenuClosed( | 4432 void RenderView::OnContextMenuClosed( |
| 4433 const webkit_glue::CustomContextMenuContext& custom_context) { | 4433 const webkit_glue::CustomContextMenuContext& custom_context) { |
| 4434 if (custom_context.is_pepper_menu) | 4434 if (custom_context.is_pepper_menu) |
| 4435 pepper_delegate_.OnContextMenuClosed(custom_context); | 4435 pepper_delegate_.OnContextMenuClosed(custom_context); |
| 4436 else | 4436 else |
| 4437 context_menu_node_.reset(); | 4437 context_menu_node_.reset(); |
| 4438 } | 4438 } |
| OLD | NEW |