Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: chrome/browser/ui/cocoa/hung_renderer_controller.mm

Issue 7670041: Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge with trunk. Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 return killButton_; 208 return killButton_;
209 } 209 }
210 210
211 - (MultiKeyEquivalentButton*)waitButton { 211 - (MultiKeyEquivalentButton*)waitButton {
212 return waitButton_; 212 return waitButton_;
213 } 213 }
214 @end 214 @end
215 215
216 namespace browser { 216 namespace browser {
217 217
218 void ShowHungRendererDialog(TabContents* contents) { 218 void ShowNativeHungRendererDialog(TabContents* contents) {
219 if (!logging::DialogsAreSuppressed()) { 219 if (!logging::DialogsAreSuppressed()) {
220 if (!g_instance) 220 if (!g_instance)
221 g_instance = [[HungRendererController alloc] 221 g_instance = [[HungRendererController alloc]
222 initWithWindowNibName:@"HungRendererDialog"]; 222 initWithWindowNibName:@"HungRendererDialog"];
223 [g_instance showForTabContents:contents]; 223 [g_instance showForTabContents:contents];
224 } 224 }
225 } 225 }
226 226
227 void HideHungRendererDialog(TabContents* contents) { 227 void HideNativeHungRendererDialog(TabContents* contents) {
228 if (!logging::DialogsAreSuppressed() && g_instance) 228 if (!logging::DialogsAreSuppressed() && g_instance)
229 [g_instance endForTabContents:contents]; 229 [g_instance endForTabContents:contents];
230 } 230 }
231 231
232 } // namespace browser 232 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698