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

Side by Side Diff: chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc

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 and fix hung renderer dialog close. 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 #include "chrome/browser/ui/browser_dialogs.h" 5 #include "chrome/browser/ui/browser_dialogs.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 gtk_widget_destroy(GTK_WIDGET(dialog_)); 212 gtk_widget_destroy(GTK_WIDGET(dialog_));
213 delete g_instance; 213 delete g_instance;
214 g_instance = NULL; 214 g_instance = NULL;
215 } 215 }
216 216
217 } // namespace 217 } // namespace
218 218
219 namespace browser { 219 namespace browser {
220 220
221 void ShowHungRendererDialog(TabContents* contents) { 221 void ShowNativeHungRendererDialog(TabContents* contents) {
222 if (!logging::DialogsAreSuppressed()) { 222 if (!logging::DialogsAreSuppressed()) {
223 if (!g_instance) 223 if (!g_instance)
224 g_instance = new HungRendererDialogGtk(); 224 g_instance = new HungRendererDialogGtk();
225 g_instance->ShowForTabContents(contents); 225 g_instance->ShowForTabContents(contents);
226 } 226 }
227 } 227 }
228 228
229 void HideHungRendererDialog(TabContents* contents) { 229 void HideNativeHungRendererDialog(TabContents* contents) {
230 if (!logging::DialogsAreSuppressed() && g_instance) 230 if (!logging::DialogsAreSuppressed() && g_instance)
231 g_instance->EndForTabContents(contents); 231 g_instance->EndForTabContents(contents);
232 } 232 }
233 233
234 } // namespace browser 234 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698