OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" | 5 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 | 8 |
9 #include "app/resource_bundle.h" | |
10 #include "app/l10n_util_mac.h" | 9 #include "app/l10n_util_mac.h" |
11 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
12 #include "base/process_util.h" | 11 #include "base/process_util.h" |
13 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
14 #include "chrome/browser/browser_list.h" | 13 #include "chrome/browser/browser_list.h" |
15 #include "chrome/browser/hung_renderer_dialog.h" | 14 #include "chrome/browser/hung_renderer_dialog.h" |
16 #include "chrome/browser/renderer_host/render_process_host.h" | 15 #include "chrome/browser/renderer_host/render_process_host.h" |
17 #include "chrome/browser/renderer_host/render_view_host.h" | 16 #include "chrome/browser/renderer_host/render_view_host.h" |
18 #include "chrome/browser/tab_contents/tab_contents.h" | 17 #include "chrome/browser/tab_contents/tab_contents.h" |
19 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" | 18 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" |
20 #include "chrome/common/logging_chrome.h" | 19 #include "chrome/common/logging_chrome.h" |
21 #include "chrome/common/result_codes.h" | 20 #include "chrome/common/result_codes.h" |
22 #include "grit/chromium_strings.h" | 21 #include "grit/chromium_strings.h" |
23 #include "grit/app_resources.h" | 22 #include "grit/app_resources.h" |
24 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
25 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
26 #include "skia/ext/skia_utils_mac.h" | 25 #include "skia/ext/skia_utils_mac.h" |
27 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" | 26 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" |
| 27 #include "ui/base/resource/resource_bundle.h" |
28 | 28 |
29 namespace { | 29 namespace { |
30 // We only support showing one of these at a time per app. The | 30 // We only support showing one of these at a time per app. The |
31 // controller owns itself and is released when its window is closed. | 31 // controller owns itself and is released when its window is closed. |
32 HungRendererController* g_instance = NULL; | 32 HungRendererController* g_instance = NULL; |
33 } // end namespace | 33 } // end namespace |
34 | 34 |
35 @implementation HungRendererController | 35 @implementation HungRendererController |
36 | 36 |
37 - (id)initWithWindowNibName:(NSString*)nibName { | 37 - (id)initWithWindowNibName:(NSString*)nibName { |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 } | 194 } |
195 } | 195 } |
196 | 196 |
197 // static | 197 // static |
198 void HideForTabContents(TabContents* contents) { | 198 void HideForTabContents(TabContents* contents) { |
199 if (!logging::DialogsAreSuppressed() && g_instance) | 199 if (!logging::DialogsAreSuppressed() && g_instance) |
200 [g_instance endForTabContents:contents]; | 200 [g_instance endForTabContents:contents]; |
201 } | 201 } |
202 | 202 |
203 } // namespace hung_renderer_dialog | 203 } // namespace hung_renderer_dialog |
OLD | NEW |