OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/mac/bundle_locations.h" | 9 #include "base/mac/bundle_locations.h" |
10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
11 #include "base/process_util.h" | 11 #include "base/process_util.h" |
12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
13 #include "chrome/browser/favicon/favicon_tab_helper.h" | 13 #include "chrome/browser/favicon/favicon_tab_helper.h" |
14 #include "chrome/browser/ui/browser_dialogs.h" | 14 #include "chrome/browser/ui/browser_dialogs.h" |
15 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" | 15 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" |
16 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h" | 16 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h" |
17 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" | 17 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
18 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" | 18 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" |
19 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 19 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
20 #include "chrome/common/logging_chrome.h" | 20 #include "chrome/common/logging_chrome.h" |
21 #include "content/public/browser/render_process_host.h" | 21 #include "content/public/browser/render_process_host.h" |
22 #include "content/public/browser/render_view_host.h" | 22 #include "content/public/browser/render_view_host.h" |
23 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
24 #include "content/public/common/result_codes.h" | 24 #include "content/public/common/result_codes.h" |
25 #include "grit/chromium_strings.h" | 25 #include "grit/chromium_strings.h" |
26 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
27 #include "grit/theme_resources.h" | 27 #include "grit/theme_resources_standard.h" |
28 #include "grit/ui_resources.h" | 28 #include "grit/ui_resources.h" |
29 #include "skia/ext/skia_utils_mac.h" | 29 #include "skia/ext/skia_utils_mac.h" |
30 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" | 30 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" |
31 #include "ui/base/l10n/l10n_util_mac.h" | 31 #include "ui/base/l10n/l10n_util_mac.h" |
32 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
33 #include "ui/gfx/image/image.h" | 33 #include "ui/gfx/image/image.h" |
34 | 34 |
35 using content::WebContents; | 35 using content::WebContents; |
36 | 36 |
37 namespace { | 37 namespace { |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 [g_instance showForWebContents:contents]; | 227 [g_instance showForWebContents:contents]; |
228 } | 228 } |
229 } | 229 } |
230 | 230 |
231 void HideHungRendererDialog(WebContents* contents) { | 231 void HideHungRendererDialog(WebContents* contents) { |
232 if (!logging::DialogsAreSuppressed() && g_instance) | 232 if (!logging::DialogsAreSuppressed() && g_instance) |
233 [g_instance endForWebContents:contents]; | 233 [g_instance endForWebContents:contents]; |
234 } | 234 } |
235 | 235 |
236 } // namespace browser | 236 } // namespace browser |
OLD | NEW |