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

Side by Side Diff: content/shell/browser/blink_test_controller.cc

Issue 1488653002: Fix scroll restoration when exiting fullscreen mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Accidentally made will_cause_resize always false in previous cleanup. Fixed Created 4 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shell/browser/blink_test_controller.h" 5 #include "content/shell/browser/blink_test_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <iostream> 9 #include <iostream>
10 10
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 render_view_host->Send(new ShellViewMsg_SetTestConfiguration( 534 render_view_host->Send(new ShellViewMsg_SetTestConfiguration(
535 render_view_host->GetRoutingID(), params)); 535 render_view_host->GetRoutingID(), params));
536 } 536 }
537 537
538 void BlinkTestController::OnTestFinished() { 538 void BlinkTestController::OnTestFinished() {
539 test_phase_ = CLEAN_UP; 539 test_phase_ = CLEAN_UP;
540 if (!printer_->output_finished()) 540 if (!printer_->output_finished())
541 printer_->PrintImageFooter(); 541 printer_->PrintImageFooter();
542 RenderViewHost* render_view_host = 542 RenderViewHost* render_view_host =
543 main_window_->web_contents()->GetRenderViewHost(); 543 main_window_->web_contents()->GetRenderViewHost();
544 main_window_->web_contents()->ExitFullscreen(); 544 main_window_->web_contents()->ExitFullscreen(/*will_cause_resize=*/false);
545 545
546 ShellBrowserContext* browser_context = 546 ShellBrowserContext* browser_context =
547 ShellContentBrowserClient::Get()->browser_context(); 547 ShellContentBrowserClient::Get()->browser_context();
548 StoragePartition* storage_partition = 548 StoragePartition* storage_partition =
549 BrowserContext::GetStoragePartition(browser_context, nullptr); 549 BrowserContext::GetStoragePartition(browser_context, nullptr);
550 storage_partition->GetServiceWorkerContext()->ClearAllServiceWorkersForTest( 550 storage_partition->GetServiceWorkerContext()->ClearAllServiceWorkersForTest(
551 base::Bind(base::IgnoreResult(&BlinkTestController::Send), 551 base::Bind(base::IgnoreResult(&BlinkTestController::Send),
552 base::Unretained(this), 552 base::Unretained(this),
553 new ShellViewMsg_Reset(render_view_host->GetRoutingID()))); 553 new ShellViewMsg_Reset(render_view_host->GetRoutingID())));
554 } 554 }
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 } else { 769 } else {
770 printer_->AddErrorMessage(base::StringPrintf( 770 printer_->AddErrorMessage(base::StringPrintf(
771 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", 771 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
772 event_name.c_str())); 772 event_name.c_str()));
773 return; 773 return;
774 } 774 }
775 bluetooth_chooser_factory_->SendEvent(event, argument); 775 bluetooth_chooser_factory_->SendEvent(event, argument);
776 } 776 }
777 777
778 } // namespace content 778 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | third_party/WebKit/Source/web/FullscreenController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698