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

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

Issue 2371723002: Power Save Blocker: Eliminate passing ViewAndroid as WeakPtr (Closed)
Patch Set: Rebase Created 4 years, 2 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/devtools/render_frame_devtools_agent_host.h" 5 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
6 6
7 #include <tuple> 7 #include <tuple>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/guid.h" 10 #include "base/guid.h"
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 } 682 }
683 683
684 void RenderFrameDevToolsAgentHost::CreatePowerSaveBlocker() { 684 void RenderFrameDevToolsAgentHost::CreatePowerSaveBlocker() {
685 #if defined(OS_ANDROID) 685 #if defined(OS_ANDROID)
686 power_save_blocker_.reset(new device::PowerSaveBlocker( 686 power_save_blocker_.reset(new device::PowerSaveBlocker(
687 device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 687 device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
688 device::PowerSaveBlocker::kReasonOther, "DevTools", 688 device::PowerSaveBlocker::kReasonOther, "DevTools",
689 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), 689 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
690 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))); 690 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));
691 if (web_contents()->GetNativeView()) { 691 if (web_contents()->GetNativeView()) {
692 view_weak_factory_.reset(new base::WeakPtrFactory<ui::ViewAndroid>(
693 web_contents()->GetNativeView()));
694 power_save_blocker_->InitDisplaySleepBlocker( 692 power_save_blocker_->InitDisplaySleepBlocker(
695 view_weak_factory_->GetWeakPtr()); 693 web_contents()->GetNativeView());
696 } 694 }
697 #endif 695 #endif
698 } 696 }
699 697
700 void RenderFrameDevToolsAgentHost::RenderProcessGone( 698 void RenderFrameDevToolsAgentHost::RenderProcessGone(
701 base::TerminationStatus status) { 699 base::TerminationStatus status) {
702 switch(status) { 700 switch(status) {
703 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: 701 case base::TERMINATION_STATUS_ABNORMAL_TERMINATION:
704 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: 702 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
705 #if defined(OS_CHROMEOS) 703 #if defined(OS_CHROMEOS)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 const GURL& validated_url, 781 const GURL& validated_url,
784 int error_code, 782 int error_code,
785 const base::string16& error_description, 783 const base::string16& error_description,
786 bool was_ignored_by_handler) { 784 bool was_ignored_by_handler) {
787 if (IsBrowserSideNavigationEnabled()) 785 if (IsBrowserSideNavigationEnabled())
788 return; 786 return;
789 if (pending_ && pending_->host() == render_frame_host) 787 if (pending_ && pending_->host() == render_frame_host)
790 DiscardPending(); 788 DiscardPending();
791 } 789 }
792 790
793 void RenderFrameDevToolsAgentHost::WebContentsDestroyed() {
794 #if defined(OS_ANDROID)
795 view_weak_factory_.reset();
796 #endif
797 }
798
799 void RenderFrameDevToolsAgentHost::WasShown() { 791 void RenderFrameDevToolsAgentHost::WasShown() {
800 CreatePowerSaveBlocker(); 792 CreatePowerSaveBlocker();
801 } 793 }
802 794
803 void RenderFrameDevToolsAgentHost::WasHidden() { 795 void RenderFrameDevToolsAgentHost::WasHidden() {
804 #if defined(OS_ANDROID) 796 #if defined(OS_ANDROID)
805 power_save_blocker_.reset(); 797 power_save_blocker_.reset();
806 #endif 798 #endif
807 } 799 }
808 800
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 RenderFrameHost* host) { 1019 RenderFrameHost* host) {
1028 return (current_ && current_->host() == host) || 1020 return (current_ && current_->host() == host) ||
1029 (pending_ && pending_->host() == host); 1021 (pending_ && pending_->host() == host);
1030 } 1022 }
1031 1023
1032 bool RenderFrameDevToolsAgentHost::IsChildFrame() { 1024 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
1033 return current_ && current_->host()->GetParent(); 1025 return current_ && current_->host()->GetParent();
1034 } 1026 }
1035 1027
1036 } // namespace content 1028 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/render_frame_devtools_agent_host.h ('k') | content/browser/media/media_web_contents_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698