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