| 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/media/media_internals_handler.h" | 5 #include "content/browser/media/media_internals_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "content/browser/media/media_internals_proxy.h" | 10 #include "content/browser/media/media_internals_proxy.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 base::Bind(&MediaInternalsMessageHandler::OnGetEverything, | 31 base::Bind(&MediaInternalsMessageHandler::OnGetEverything, |
| 32 base::Unretained(this))); | 32 base::Unretained(this))); |
| 33 } | 33 } |
| 34 | 34 |
| 35 void MediaInternalsMessageHandler::OnGetEverything( | 35 void MediaInternalsMessageHandler::OnGetEverything( |
| 36 const base::ListValue* list) { | 36 const base::ListValue* list) { |
| 37 page_load_complete_ = true; | 37 page_load_complete_ = true; |
| 38 proxy_->GetEverything(); | 38 proxy_->GetEverything(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void MediaInternalsMessageHandler::OnUpdate(const string16& update) { | 41 void MediaInternalsMessageHandler::OnUpdate(const base::string16& update) { |
| 42 // Don't try to execute JavaScript in a RenderView that no longer exists nor | 42 // Don't try to execute JavaScript in a RenderView that no longer exists nor |
| 43 // if the chrome://media-internals page hasn't finished loading. | 43 // if the chrome://media-internals page hasn't finished loading. |
| 44 RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost(); | 44 RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost(); |
| 45 if (host && page_load_complete_) | 45 if (host && page_load_complete_) |
| 46 host->ExecuteJavascriptInWebFrame(string16(), update); | 46 host->ExecuteJavascriptInWebFrame(base::string16(), update); |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace content | 49 } // namespace content |
| OLD | NEW |