| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "chrome/browser/ui/views/hung_renderer_view.h" | 5 #include "chrome/browser/ui/views/hung_renderer_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "chrome/browser/platform_util.h" | 10 #include "chrome/browser/platform_util.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 void ShowDialog(const std::string& name) override { | 23 void ShowDialog(const std::string& name) override { |
| 24 auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); | 24 auto* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); |
| 25 TabDialogs::FromWebContents(web_contents) | 25 TabDialogs::FromWebContents(web_contents) |
| 26 ->ShowHungRendererDialog(content::WebContentsUnresponsiveState()); | 26 ->ShowHungRendererDialog(content::WebContentsUnresponsiveState()); |
| 27 } | 27 } |
| 28 | 28 |
| 29 private: | 29 private: |
| 30 DISALLOW_COPY_AND_ASSIGN(HungRendererDialogViewBrowserTest); | 30 DISALLOW_COPY_AND_ASSIGN(HungRendererDialogViewBrowserTest); |
| 31 }; | 31 }; |
| 32 | 32 |
| 33 // TODO(tapted): On OSX the framework doesn't pick up the spawned dialog, and | |
| 34 // the ASSERT_EQ in TestBrowserDialog::RunDialog() fails, so disabled for now. | |
| 35 #if defined(OS_MACOSX) | |
| 36 #define MAYBE_InvokeDialog_default DISABLED_InvokeDialog_default | |
| 37 #else | |
| 38 #define MAYBE_InvokeDialog_default InvokeDialog_default | |
| 39 #endif | |
| 40 // Invokes the hung renderer (aka page unresponsive) dialog. See | 33 // Invokes the hung renderer (aka page unresponsive) dialog. See |
| 41 // test_browser_dialog.h. | 34 // test_browser_dialog.h. |
| 35 // TODO(tapted): The framework sometimes doesn't pick up the spawned dialog and |
| 36 // the ASSERT_EQ in TestBrowserDialog::RunDialog() fails. This seems to only |
| 37 // happen on the bots. So the test is disabled for now. |
| 42 IN_PROC_BROWSER_TEST_F(HungRendererDialogViewBrowserTest, | 38 IN_PROC_BROWSER_TEST_F(HungRendererDialogViewBrowserTest, |
| 43 MAYBE_InvokeDialog_default) { | 39 DISABLED_InvokeDialog_default) { |
| 44 RunDialog(); | 40 RunDialog(); |
| 45 } | 41 } |
| OLD | NEW |