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

Unified Diff: chrome/browser/ui/webui/hung_renderer_dialog.cc

Issue 9187027: Attempt 2 at: Adds a trivial views based table implementation (only supports single (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/hung_renderer_dialog.cc
diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc
index 28ef521ab30dfb455042ad1364e7eb1e7b398afb..3d05d85bada9669e518416d401b9d905af4dd8d8 100644
--- a/chrome/browser/ui/webui/hung_renderer_dialog.cc
+++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -41,7 +41,10 @@ const int kHungRendererDialogHeight = 200;
namespace browser {
void ShowHungRendererDialog(WebContents* contents) {
-#if defined(OS_CHROMEOS) || defined(USE_AURA)
+ // TODO(jhawkins): move this into a non-webui location.
+#if defined(USE_AURA)
+ ShowNativeHungRendererDialog(contents);
+#elif defined(OS_CHROMEOS)
HungRendererDialog::ShowHungRendererDialog(contents);
#else
// TODO(rbyers): Remove IsMoreWebUI check once we decide for sure which
@@ -54,7 +57,9 @@ void ShowHungRendererDialog(WebContents* contents) {
}
void HideHungRendererDialog(WebContents* contents) {
-#if defined(OS_CHROMEOS) || defined(USE_AURA)
+#if defined(USE_AURA)
+ HideNativeHungRendererDialog(contents);
+#elif defined(OS_CHROMEOS)
HungRendererDialog::HideHungRendererDialog(contents);
#else
if (chrome_web_ui::IsMoreWebUI())

Powered by Google App Engine
This is Rietveld 408576698