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

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: Trying to fix test broken on Mac Created 5 years 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 <iostream> 7 #include <iostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 render_view_host->Send(new ShellViewMsg_SetTestConfiguration( 531 render_view_host->Send(new ShellViewMsg_SetTestConfiguration(
532 render_view_host->GetRoutingID(), params)); 532 render_view_host->GetRoutingID(), params));
533 } 533 }
534 534
535 void BlinkTestController::OnTestFinished() { 535 void BlinkTestController::OnTestFinished() {
536 test_phase_ = CLEAN_UP; 536 test_phase_ = CLEAN_UP;
537 if (!printer_->output_finished()) 537 if (!printer_->output_finished())
538 printer_->PrintImageFooter(); 538 printer_->PrintImageFooter();
539 RenderViewHost* render_view_host = 539 RenderViewHost* render_view_host =
540 main_window_->web_contents()->GetRenderViewHost(); 540 main_window_->web_contents()->GetRenderViewHost();
541 main_window_->web_contents()->ExitFullscreen(); 541 main_window_->web_contents()->ExitFullscreen(/*will_cause_resize=*/false);
542 542
543 ShellBrowserContext* browser_context = 543 ShellBrowserContext* browser_context =
544 ShellContentBrowserClient::Get()->browser_context(); 544 ShellContentBrowserClient::Get()->browser_context();
545 StoragePartition* storage_partition = 545 StoragePartition* storage_partition =
546 BrowserContext::GetStoragePartition(browser_context, nullptr); 546 BrowserContext::GetStoragePartition(browser_context, nullptr);
547 storage_partition->GetServiceWorkerContext()->ClearAllServiceWorkersForTest( 547 storage_partition->GetServiceWorkerContext()->ClearAllServiceWorkersForTest(
548 base::Bind(base::IgnoreResult(&BlinkTestController::Send), 548 base::Bind(base::IgnoreResult(&BlinkTestController::Send),
549 base::Unretained(this), 549 base::Unretained(this),
550 new ShellViewMsg_Reset(render_view_host->GetRoutingID()))); 550 new ShellViewMsg_Reset(render_view_host->GetRoutingID())));
551 } 551 }
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 } else { 766 } else {
767 printer_->AddErrorMessage(base::StringPrintf( 767 printer_->AddErrorMessage(base::StringPrintf(
768 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", 768 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
769 event_name.c_str())); 769 event_name.c_str()));
770 return; 770 return;
771 } 771 }
772 bluetooth_chooser_factory_->SendEvent(event, argument); 772 bluetooth_chooser_factory_->SendEvent(event, argument);
773 } 773 }
774 774
775 } // namespace content 775 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698