OLD | NEW |
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 #include "chrome/browser/hung_renderer_dialog.h" | 5 #include "chrome/browser/hung_renderer_dialog.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 | 8 |
9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/browser_list.h" | 11 #include "chrome/browser/browser_list.h" |
12 #include "chrome/browser/renderer_host/render_process_host.h" | 12 #include "chrome/browser/renderer_host/render_process_host.h" |
13 #include "chrome/browser/renderer_host/render_view_host.h" | 13 #include "chrome/browser/renderer_host/render_view_host.h" |
14 #include "chrome/browser/tab_contents/tab_contents.h" | 14 #include "chrome/browser/tab_contents/tab_contents.h" |
15 #include "chrome/browser/ui/gtk/gtk_util.h" | 15 #include "chrome/browser/ui/gtk/gtk_util.h" |
16 #include "chrome/common/logging_chrome.h" | 16 #include "chrome/common/logging_chrome.h" |
17 #include "chrome/common/result_codes.h" | 17 #include "chrome/common/result_codes.h" |
18 #include "gfx/gtk_util.h" | |
19 #include "grit/chromium_strings.h" | 18 #include "grit/chromium_strings.h" |
20 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
21 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" |
22 #include "ui/base/gtk/gtk_signal.h" | 21 #include "ui/base/gtk/gtk_signal.h" |
23 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
24 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
| 24 #include "ui/gfx/gtk_util.h" |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 // A wrapper class that represents the Gtk dialog. | 28 // A wrapper class that represents the Gtk dialog. |
29 class HungRendererDialogGtk { | 29 class HungRendererDialogGtk { |
30 public: | 30 public: |
31 HungRendererDialogGtk(); | 31 HungRendererDialogGtk(); |
32 void ShowForTabContents(TabContents* hung_contents); | 32 void ShowForTabContents(TabContents* hung_contents); |
33 void EndForTabContents(TabContents* hung_contents); | 33 void EndForTabContents(TabContents* hung_contents); |
34 | 34 |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 } | 220 } |
221 } | 221 } |
222 | 222 |
223 // static | 223 // static |
224 void HideForTabContents(TabContents* contents) { | 224 void HideForTabContents(TabContents* contents) { |
225 if (!logging::DialogsAreSuppressed() && g_instance) | 225 if (!logging::DialogsAreSuppressed() && g_instance) |
226 g_instance->EndForTabContents(contents); | 226 g_instance->EndForTabContents(contents); |
227 } | 227 } |
228 | 228 |
229 } // namespace hung_renderer_dialog | 229 } // namespace hung_renderer_dialog |
OLD | NEW |