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 #include "content/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1520 NotificationService::current()->Notify( | 1520 NotificationService::current()->Notify( |
1521 NOTIFICATION_FOCUS_CHANGED_IN_PAGE, | 1521 NOTIFICATION_FOCUS_CHANGED_IN_PAGE, |
1522 Source<RenderViewHost>(this), | 1522 Source<RenderViewHost>(this), |
1523 Details<const bool>(&is_editable_node)); | 1523 Details<const bool>(&is_editable_node)); |
1524 } | 1524 } |
1525 | 1525 |
1526 void RenderViewHostImpl::OnAddMessageToConsole( | 1526 void RenderViewHostImpl::OnAddMessageToConsole( |
1527 int32 level, | 1527 int32 level, |
1528 const string16& message, | 1528 const string16& message, |
1529 int32 line_no, | 1529 int32 line_no, |
1530 const string16& source_id) { | 1530 const string16& source_id, |
| 1531 const string16& stack_trace) { |
1531 if (delegate_->AddMessageToConsole(level, message, line_no, source_id)) | 1532 if (delegate_->AddMessageToConsole(level, message, line_no, source_id)) |
1532 return; | 1533 return; |
1533 // Pass through log level only on WebUI pages to limit console spew. | 1534 // Pass through log level only on WebUI pages to limit console spew. |
1534 int32 resolved_level = HasWebUIScheme(delegate_->GetURL()) ? level : 0; | 1535 int32 resolved_level = HasWebUIScheme(delegate_->GetURL()) ? level : 0; |
1535 | 1536 |
1536 if (resolved_level >= ::logging::GetMinLogLevel()) { | 1537 if (resolved_level >= ::logging::GetMinLogLevel()) { |
1537 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" << | 1538 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" << |
1538 message << "\", source: " << source_id << " (" << line_no << ")"; | 1539 message << "\", source: " << source_id << " (" << line_no << ")"; |
1539 } | 1540 } |
1540 } | 1541 } |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2089 const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles(); | 2090 const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles(); |
2090 for (std::vector<base::FilePath>::const_iterator file = file_paths.begin(); | 2091 for (std::vector<base::FilePath>::const_iterator file = file_paths.begin(); |
2091 file != file_paths.end(); ++file) { | 2092 file != file_paths.end(); ++file) { |
2092 if (!policy->CanReadFile(GetProcess()->GetID(), *file)) | 2093 if (!policy->CanReadFile(GetProcess()->GetID(), *file)) |
2093 return false; | 2094 return false; |
2094 } | 2095 } |
2095 return true; | 2096 return true; |
2096 } | 2097 } |
2097 | 2098 |
2098 } // namespace content | 2099 } // namespace content |
OLD | NEW |