Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: content/browser/media/media_internals_handler.cc

Issue 1000373002: favor DCHECK_CURRENTLY_ON for better logs in content/browser/[f-p]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
12 #include "content/public/browser/render_frame_host.h" 12 #include "content/public/browser/render_frame_host.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/browser/web_ui.h" 14 #include "content/public/browser/web_ui.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 MediaInternalsMessageHandler::MediaInternalsMessageHandler() 18 MediaInternalsMessageHandler::MediaInternalsMessageHandler()
19 : proxy_(new MediaInternalsProxy()), 19 : proxy_(new MediaInternalsProxy()),
20 page_load_complete_(false) {} 20 page_load_complete_(false) {}
21 21
22 MediaInternalsMessageHandler::~MediaInternalsMessageHandler() { 22 MediaInternalsMessageHandler::~MediaInternalsMessageHandler() {
23 proxy_->Detach(); 23 proxy_->Detach();
24 } 24 }
25 25
26 void MediaInternalsMessageHandler::RegisterMessages() { 26 void MediaInternalsMessageHandler::RegisterMessages() {
27 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 27 DCHECK_CURRENTLY_ON(BrowserThread::UI);
28 proxy_->Attach(this); 28 proxy_->Attach(this);
29 29
30 web_ui()->RegisterMessageCallback("getEverything", 30 web_ui()->RegisterMessageCallback("getEverything",
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 base::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 RenderFrameHost* host = web_ui()->GetWebContents()->GetMainFrame(); 44 RenderFrameHost* host = web_ui()->GetWebContents()->GetMainFrame();
45 if (host && page_load_complete_) 45 if (host && page_load_complete_)
46 host->ExecuteJavaScript(update); 46 host->ExecuteJavaScript(update);
47 } 47 }
48 48
49 } // namespace content 49 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_internals.cc ('k') | content/browser/media/media_internals_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698