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 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1516 NotificationService::current()->Notify( | 1516 NotificationService::current()->Notify( |
1517 NOTIFICATION_FOCUS_CHANGED_IN_PAGE, | 1517 NOTIFICATION_FOCUS_CHANGED_IN_PAGE, |
1518 Source<RenderViewHost>(this), | 1518 Source<RenderViewHost>(this), |
1519 Details<const bool>(&is_editable_node)); | 1519 Details<const bool>(&is_editable_node)); |
1520 } | 1520 } |
1521 | 1521 |
1522 void RenderViewHostImpl::OnAddMessageToConsole( | 1522 void RenderViewHostImpl::OnAddMessageToConsole( |
1523 int32 level, | 1523 int32 level, |
1524 const string16& message, | 1524 const string16& message, |
1525 int32 line_no, | 1525 int32 line_no, |
1526 const string16& source_id) { | 1526 const string16& source_id, |
1527 if (delegate_->AddMessageToConsole(level, message, line_no, source_id)) | 1527 const string16& stack_trace) { |
| 1528 if (delegate_->AddMessageToConsole( |
| 1529 level, message, line_no, source_id, stack_trace)) { |
1528 return; | 1530 return; |
| 1531 } |
1529 // Pass through log level only on WebUI pages to limit console spew. | 1532 // Pass through log level only on WebUI pages to limit console spew. |
1530 int32 resolved_level = HasWebUIScheme(delegate_->GetURL()) ? level : 0; | 1533 int32 resolved_level = HasWebUIScheme(delegate_->GetURL()) ? level : 0; |
1531 | 1534 |
1532 if (resolved_level >= ::logging::GetMinLogLevel()) { | 1535 if (resolved_level >= ::logging::GetMinLogLevel()) { |
1533 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" << | 1536 logging::LogMessage("CONSOLE", line_no, resolved_level).stream() << "\"" << |
1534 message << "\", source: " << source_id << " (" << line_no << ")"; | 1537 message << "\", source: " << source_id << " (" << line_no << ")"; |
1535 } | 1538 } |
1536 } | 1539 } |
1537 | 1540 |
1538 void RenderViewHostImpl::AddObserver(RenderViewHostObserver* observer) { | 1541 void RenderViewHostImpl::AddObserver(RenderViewHostObserver* observer) { |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2054 const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles(); | 2057 const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles(); |
2055 for (std::vector<base::FilePath>::const_iterator file = file_paths.begin(); | 2058 for (std::vector<base::FilePath>::const_iterator file = file_paths.begin(); |
2056 file != file_paths.end(); ++file) { | 2059 file != file_paths.end(); ++file) { |
2057 if (!policy->CanReadFile(GetProcess()->GetID(), *file)) | 2060 if (!policy->CanReadFile(GetProcess()->GetID(), *file)) |
2058 return false; | 2061 return false; |
2059 } | 2062 } |
2060 return true; | 2063 return true; |
2061 } | 2064 } |
2062 | 2065 |
2063 } // namespace content | 2066 } // namespace content |
OLD | NEW |