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" | |
12 #include "base/strings/sys_string_conversions.h" | 11 #include "base/strings/sys_string_conversions.h" |
13 #include "chrome/browser/favicon/favicon_tab_helper.h" | 12 #include "chrome/browser/favicon/favicon_tab_helper.h" |
14 #include "chrome/browser/ui/browser_dialogs.h" | 13 #include "chrome/browser/ui/browser_dialogs.h" |
15 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" | 14 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" |
16 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" | 15 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" |
17 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" | 16 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
18 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" | 17 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" |
19 #include "chrome/common/logging_chrome.h" | 18 #include "chrome/common/logging_chrome.h" |
20 #include "content/public/browser/render_process_host.h" | 19 #include "content/public/browser/render_process_host.h" |
21 #include "content/public/browser/render_view_host.h" | 20 #include "content/public/browser/render_view_host.h" |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 [g_instance showForWebContents:contents]; | 231 [g_instance showForWebContents:contents]; |
233 } | 232 } |
234 } | 233 } |
235 | 234 |
236 void HideHungRendererDialog(WebContents* contents) { | 235 void HideHungRendererDialog(WebContents* contents) { |
237 if (!logging::DialogsAreSuppressed() && g_instance) | 236 if (!logging::DialogsAreSuppressed() && g_instance) |
238 [g_instance endForWebContents:contents]; | 237 [g_instance endForWebContents:contents]; |
239 } | 238 } |
240 | 239 |
241 } // namespace chrome | 240 } // namespace chrome |
OLD | NEW |