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

Side by Side Diff: chrome/browser/ui/webui/hung_renderer_dialog.h

Issue 8462015: Tests for WebUI Hung Renderer Dialog (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: missing virtual keyword on destructor (caught on mac try) Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_WEBUI_HUNG_RENDERER_DIALOG_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_HUNG_RENDERER_DIALOG_H_
6 #define CHROME_BROWSER_UI_WEBUI_HUNG_RENDERER_DIALOG_H_ 6 #define CHROME_BROWSER_UI_WEBUI_HUNG_RENDERER_DIALOG_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/scoped_ptr.h"
12 #include "base/string16.h" 13 #include "base/string16.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "chrome/browser/ui/webui/html_dialog_ui.h" 15 #include "chrome/browser/ui/webui/html_dialog_ui.h"
16 #include "content/browser/tab_contents/tab_contents_observer.h"
15 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
16 18
17 class TabContents; 19 class TabContents;
18 class HungRendererDialogHandler; 20 class HungRendererDialogHandler;
19 21
20 class HungRendererDialog : private HtmlDialogUIDelegate { 22 class HungRendererDialog : private HtmlDialogUIDelegate {
21 public: 23 public:
22 // Shows a hung renderer dialog. 24 // Shows a hung renderer dialog.
23 static void ShowHungRendererDialog(TabContents* contents); 25 static void ShowHungRendererDialog(TabContents* contents);
24 26
25 // Hides a hung renderer dialog. 27 // Hides a hung renderer dialog.
26 static void HideHungRendererDialog(TabContents* contents); 28 static void HideHungRendererDialog(TabContents* contents);
27 29
28 private: 30 private:
29 HungRendererDialog(); 31 class TabContentsObserverImpl : public TabContentsObserver {
32 public:
33 TabContentsObserverImpl(HungRendererDialog* dialog,
34 TabContents* contents);
35
36 // TabContentsObserver overrides:
37 virtual void RenderViewGone() OVERRIDE;
38 virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
39
40 private:
41 TabContents* contents_; // weak
42 HungRendererDialog* dialog_; // weak
43
44 DISALLOW_COPY_AND_ASSIGN(TabContentsObserverImpl);
45 };
46
47 friend class HungRendererDialogUITest;
48
49 explicit HungRendererDialog(bool is_enabled);
50 virtual ~HungRendererDialog();
51
52 // Shows a hung renderer dialog that, if not enabled, won't kill processes
53 // or restart hang timers.
54 static void ShowHungRendererDialogInternal(TabContents* contents,
55 bool is_enabled);
30 56
31 // Shows the hung renderer dialog. 57 // Shows the hung renderer dialog.
32 void ShowDialog(TabContents* contents); 58 void ShowDialog(TabContents* contents);
33 59
34 // Hides the hung renderer dialog. 60 // Hides the hung renderer dialog.
35 void HideDialog(TabContents* contents); 61 void HideDialog(TabContents* contents);
36 62
37 // HtmlDialogUIDelegate methods 63 // HtmlDialogUIDelegate methods
38 virtual bool IsDialogModal() const OVERRIDE; 64 virtual bool IsDialogModal() const OVERRIDE;
39 virtual string16 GetDialogTitle() const OVERRIDE; 65 virtual string16 GetDialogTitle() const OVERRIDE;
40 virtual GURL GetDialogContentURL() const OVERRIDE; 66 virtual GURL GetDialogContentURL() const OVERRIDE;
41 virtual void GetWebUIMessageHandlers( 67 virtual void GetWebUIMessageHandlers(
42 std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE; 68 std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
43 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE; 69 virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
44 virtual std::string GetDialogArgs() const OVERRIDE; 70 virtual std::string GetDialogArgs() const OVERRIDE;
45 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE; 71 virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
46 virtual void OnCloseContents(TabContents* source, 72 virtual void OnCloseContents(TabContents* source,
47 bool* out_close_dialog) OVERRIDE; 73 bool* out_close_dialog) OVERRIDE;
48 virtual bool ShouldShowDialogTitle() const OVERRIDE; 74 virtual bool ShouldShowDialogTitle() const OVERRIDE;
49 75
50 // The tab contents. 76 // The tab contents.
51 TabContents* contents_; 77 TabContents* contents_;
52 78
53 // The dialog handler. 79 // The dialog handler.
54 HungRendererDialogHandler* handler_; 80 HungRendererDialogHandler* handler_;
55 81
82 // A safety switch that must be enabled to allow actual killing of processes
83 // or restarting of the hang timer. This is necessary so that tests can
84 // create a disabled version of this dialog that won't kill processes or
85 // restart timers when the dialog closes at the end of the test.
86 bool is_enabled_;
87
56 // The dialog window. 88 // The dialog window.
57 gfx::NativeWindow window_; 89 gfx::NativeWindow window_;
58 90
91 scoped_ptr<TabContentsObserverImpl> contents_observer_;
92
59 DISALLOW_COPY_AND_ASSIGN(HungRendererDialog); 93 DISALLOW_COPY_AND_ASSIGN(HungRendererDialog);
60 }; 94 };
61 95
62 // Dialog handler that handles calls from the JS WebUI code to get the details 96 // Dialog handler that handles calls from the JS WebUI code to get the details
63 // of the list of frozen tabs. 97 // of the list of frozen tabs.
64 class HungRendererDialogHandler : public WebUIMessageHandler { 98 class HungRendererDialogHandler : public WebUIMessageHandler {
65 public: 99 public:
66 explicit HungRendererDialogHandler(TabContents* contents); 100 explicit HungRendererDialogHandler(TabContents* contents);
67 101
68 void CloseDialog(); 102 void CloseDialog();
69 103
70 // Overridden from WebUIMessageHandler 104 // Overridden from WebUIMessageHandler
71 virtual void RegisterMessages(); 105 virtual void RegisterMessages();
72 106
73 private: 107 private:
74 void RequestTabContentsList(const base::ListValue* args); 108 void RequestTabContentsList(const base::ListValue* args);
75 109
76 // The tab contents. 110 // The tab contents.
77 TabContents* contents_; 111 TabContents* contents_;
78 112
79 DISALLOW_COPY_AND_ASSIGN(HungRendererDialogHandler); 113 DISALLOW_COPY_AND_ASSIGN(HungRendererDialogHandler);
80 }; 114 };
81 115
82 116
83 #endif // CHROME_BROWSER_UI_WEBUI_HUNG_RENDERER_DIALOG_H_ 117 #endif // CHROME_BROWSER_UI_WEBUI_HUNG_RENDERER_DIALOG_H_
84 118
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698