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

Side by Side Diff: chrome/browser/ui/views/hung_renderer_view.cc

Issue 7957002: Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 #include "chrome/browser/ui/browser_dialogs.h" 5 #include "chrome/browser/ui/browser_dialogs.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/favicon/favicon_tab_helper.h" 10 #include "chrome/browser/favicon/favicon_tab_helper.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 } 547 }
548 548
549 static HungRendererDialogView* CreateHungRendererDialogView() { 549 static HungRendererDialogView* CreateHungRendererDialogView() {
550 HungRendererDialogView* cv = new HungRendererDialogView; 550 HungRendererDialogView* cv = new HungRendererDialogView;
551 views::Widget::CreateWindow(cv); 551 views::Widget::CreateWindow(cv);
552 return cv; 552 return cv;
553 } 553 }
554 554
555 namespace browser { 555 namespace browser {
556 556
557 void ShowHungRendererDialog(TabContents* contents) { 557 void ShowNativeHungRendererDialog(TabContents* contents) {
558 if (!logging::DialogsAreSuppressed()) { 558 if (!logging::DialogsAreSuppressed()) {
559 if (!g_instance) 559 if (!g_instance)
560 g_instance = CreateHungRendererDialogView(); 560 g_instance = CreateHungRendererDialogView();
561 g_instance->ShowForTabContents(contents); 561 g_instance->ShowForTabContents(contents);
562 } 562 }
563 } 563 }
564 564
565 void HideHungRendererDialog(TabContents* contents) { 565 void HideNativeHungRendererDialog(TabContents* contents) {
566 if (!logging::DialogsAreSuppressed() && g_instance) 566 if (!logging::DialogsAreSuppressed() && g_instance)
567 g_instance->EndForTabContents(contents); 567 g_instance->EndForTabContents(contents);
568 } 568 }
569 569
570 } // namespace browser 570 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc ('k') | chrome/browser/ui/webui/bookmarks_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698