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

Side by Side Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 2006143006: Revert of Pass SequencedTaskRunner to PowerSaveBlocker for ui/file operations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@device-power-save-blocker
Patch Set: Created 4 years, 7 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
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/download/download_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/devtools/render_frame_devtools_agent_host.h" 5 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/browser/web_contents/web_contents_impl.h" 32 #include "content/browser/web_contents/web_contents_impl.h"
33 #include "content/common/view_messages.h" 33 #include "content/common/view_messages.h"
34 #include "content/public/browser/browser_context.h" 34 #include "content/public/browser/browser_context.h"
35 #include "content/public/browser/content_browser_client.h" 35 #include "content/public/browser/content_browser_client.h"
36 #include "content/public/browser/render_widget_host_iterator.h" 36 #include "content/public/browser/render_widget_host_iterator.h"
37 #include "content/public/browser/web_contents_delegate.h" 37 #include "content/public/browser/web_contents_delegate.h"
38 #include "content/public/common/browser_side_navigation_policy.h" 38 #include "content/public/common/browser_side_navigation_policy.h"
39 39
40 #if defined(OS_ANDROID) 40 #if defined(OS_ANDROID)
41 #include "content/browser/power_save_blocker_impl.h" 41 #include "content/browser/power_save_blocker_impl.h"
42 #include "content/public/browser/power_save_blocker_factory.h"
43 #include "content/public/browser/render_widget_host_view.h" 42 #include "content/public/browser/render_widget_host_view.h"
44 #endif 43 #endif
45 44
46 namespace content { 45 namespace content {
47 46
48 typedef std::vector<RenderFrameDevToolsAgentHost*> Instances; 47 typedef std::vector<RenderFrameDevToolsAgentHost*> Instances;
49 48
50 namespace { 49 namespace {
51 base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER; 50 base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER;
52 51
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 pending_->InspectElement(x, y); 490 pending_->InspectElement(x, y);
492 } 491 }
493 492
494 void RenderFrameDevToolsAgentHost::OnClientAttached() { 493 void RenderFrameDevToolsAgentHost::OnClientAttached() {
495 if (!web_contents()) 494 if (!web_contents())
496 return; 495 return;
497 496
498 frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder()); 497 frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder());
499 #if defined(OS_ANDROID) 498 #if defined(OS_ANDROID)
500 power_save_blocker_.reset(static_cast<PowerSaveBlockerImpl*>( 499 power_save_blocker_.reset(static_cast<PowerSaveBlockerImpl*>(
501 CreatePowerSaveBlocker( 500 PowerSaveBlocker::Create(
502 PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 501 PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
503 PowerSaveBlocker::kReasonOther, "DevTools") 502 PowerSaveBlocker::kReasonOther, "DevTools").release()));
504 .release()));
505 power_save_blocker_->InitDisplaySleepBlocker(web_contents()); 503 power_save_blocker_->InitDisplaySleepBlocker(web_contents());
506 #endif 504 #endif
507 505
508 // TODO(kaznacheev): Move this call back to DevToolsManager when 506 // TODO(kaznacheev): Move this call back to DevToolsManager when
509 // extensions::ProcessManager no longer relies on this notification. 507 // extensions::ProcessManager no longer relies on this notification.
510 DevToolsAgentHostImpl::NotifyCallbacks(this, true); 508 DevToolsAgentHostImpl::NotifyCallbacks(this, true);
511 } 509 }
512 510
513 void RenderFrameDevToolsAgentHost::OnClientDetached() { 511 void RenderFrameDevToolsAgentHost::OnClientDetached() {
514 #if defined(OS_ANDROID) 512 #if defined(OS_ANDROID)
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 RenderFrameHost* host) { 906 RenderFrameHost* host) {
909 return (current_ && current_->host() == host) || 907 return (current_ && current_->host() == host) ||
910 (pending_ && pending_->host() == host); 908 (pending_ && pending_->host() == host);
911 } 909 }
912 910
913 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 911 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
914 return current_ && current_->host()->GetParent(); 912 return current_ && current_->host()->GetParent();
915 } 913 }
916 914
917 } // namespace content 915 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698