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 #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/mac_util.h" | 9 #include "base/mac/mac_util.h" |
10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 return killButton_; | 174 return killButton_; |
175 } | 175 } |
176 | 176 |
177 - (MultiKeyEquivalentButton*)waitButton { | 177 - (MultiKeyEquivalentButton*)waitButton { |
178 return waitButton_; | 178 return waitButton_; |
179 } | 179 } |
180 @end | 180 @end |
181 | 181 |
182 namespace browser { | 182 namespace browser { |
183 | 183 |
184 void ShowHungRendererDialog(TabContents* contents) { | 184 void ShowNativeHungRendererDialog(TabContents* contents) { |
185 if (!logging::DialogsAreSuppressed()) { | 185 if (!logging::DialogsAreSuppressed()) { |
186 if (!g_instance) | 186 if (!g_instance) |
187 g_instance = [[HungRendererController alloc] | 187 g_instance = [[HungRendererController alloc] |
188 initWithWindowNibName:@"HungRendererDialog"]; | 188 initWithWindowNibName:@"HungRendererDialog"]; |
189 [g_instance showForTabContents:contents]; | 189 [g_instance showForTabContents:contents]; |
190 } | 190 } |
191 } | 191 } |
192 | 192 |
193 void HideHungRendererDialog(TabContents* contents) { | 193 void HideNativeHungRendererDialog(TabContents* contents) { |
194 if (!logging::DialogsAreSuppressed() && g_instance) | 194 if (!logging::DialogsAreSuppressed() && g_instance) |
195 [g_instance endForTabContents:contents]; | 195 [g_instance endForTabContents:contents]; |
196 } | 196 } |
197 | 197 |
198 } // namespace browser | 198 } // namespace browser |
OLD | NEW |