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/macros.h" |
10 #include "base/process/process.h" | 11 #include "base/process/process.h" |
11 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
12 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" | 13 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" |
13 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" | 14 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" |
14 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" | 15 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
15 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" | 16 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" |
16 #include "chrome/common/logging_chrome.h" | 17 #include "chrome/common/logging_chrome.h" |
17 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
18 #include "content/public/browser/render_process_host.h" | 19 #include "content/public/browser/render_process_host.h" |
19 #include "content/public/browser/render_view_host.h" | 20 #include "content/public/browser/render_view_host.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 | 263 |
263 @implementation HungRendererController (JustForTesting) | 264 @implementation HungRendererController (JustForTesting) |
264 - (NSButton*)killButton { | 265 - (NSButton*)killButton { |
265 return killButton_; | 266 return killButton_; |
266 } | 267 } |
267 | 268 |
268 - (MultiKeyEquivalentButton*)waitButton { | 269 - (MultiKeyEquivalentButton*)waitButton { |
269 return waitButton_; | 270 return waitButton_; |
270 } | 271 } |
271 @end | 272 @end |
OLD | NEW |