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

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

Issue 1555163002: Revert "Revert of Support device scale factor test with popups in LayoutTest (patchset #2 id:40001 … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hypothentical fix 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseRemainingWindows, 409 IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseRemainingWindows,
410 OnCloseRemainingWindows) 410 OnCloseRemainingWindows)
411 IPC_MESSAGE_HANDLER(ShellViewHostMsg_ResetDone, OnResetDone) 411 IPC_MESSAGE_HANDLER(ShellViewHostMsg_ResetDone, OnResetDone)
412 IPC_MESSAGE_HANDLER(ShellViewHostMsg_LeakDetectionDone, OnLeakDetectionDone) 412 IPC_MESSAGE_HANDLER(ShellViewHostMsg_LeakDetectionDone, OnLeakDetectionDone)
413 IPC_MESSAGE_HANDLER(ShellViewHostMsg_SetBluetoothManualChooser, 413 IPC_MESSAGE_HANDLER(ShellViewHostMsg_SetBluetoothManualChooser,
414 OnSetBluetoothManualChooser) 414 OnSetBluetoothManualChooser)
415 IPC_MESSAGE_HANDLER(ShellViewHostMsg_GetBluetoothManualChooserEvents, 415 IPC_MESSAGE_HANDLER(ShellViewHostMsg_GetBluetoothManualChooserEvents,
416 OnGetBluetoothManualChooserEvents) 416 OnGetBluetoothManualChooserEvents)
417 IPC_MESSAGE_HANDLER(ShellViewHostMsg_SendBluetoothManualChooserEvent, 417 IPC_MESSAGE_HANDLER(ShellViewHostMsg_SendBluetoothManualChooserEvent,
418 OnSendBluetoothManualChooserEvent) 418 OnSendBluetoothManualChooserEvent)
419 IPC_MESSAGE_HANDLER(ShellViewHostMsg_SetDeviceScaleFactor,
420 OnSetDeviceScaleFactor)
419 IPC_MESSAGE_UNHANDLED(handled = false) 421 IPC_MESSAGE_UNHANDLED(handled = false)
420 IPC_END_MESSAGE_MAP() 422 IPC_END_MESSAGE_MAP()
421 423
422 return handled; 424 return handled;
423 } 425 }
424 426
425 void BlinkTestController::PluginCrashed(const base::FilePath& plugin_path, 427 void BlinkTestController::PluginCrashed(const base::FilePath& plugin_path,
426 base::ProcessId plugin_pid) { 428 base::ProcessId plugin_pid) {
427 DCHECK(CalledOnValidThread()); 429 DCHECK(CalledOnValidThread());
428 printer_->AddErrorMessage( 430 printer_->AddErrorMessage(
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 event = BluetoothChooser::Event::RESCAN; 770 event = BluetoothChooser::Event::RESCAN;
769 } else { 771 } else {
770 printer_->AddErrorMessage(base::StringPrintf( 772 printer_->AddErrorMessage(base::StringPrintf(
771 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", 773 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
772 event_name.c_str())); 774 event_name.c_str()));
773 return; 775 return;
774 } 776 }
775 bluetooth_chooser_factory_->SendEvent(event, argument); 777 bluetooth_chooser_factory_->SendEvent(event, argument);
776 } 778 }
777 779
780 void BlinkTestController::OnSetDeviceScaleFactor(float scale) {
781 main_window_->SetDeviceScaleFactor(scale);
782 }
783
778 } // namespace content 784 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698