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

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

Issue 7087028: roll clang 131935:132017 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 6 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 14 matching lines...) Expand all
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/gtk_util.h" 26 #include "ui/gfx/gtk_util.h"
27 #include "ui/gfx/image.h" 27 #include "ui/gfx/image.h"
28 28
29 namespace { 29 namespace {
30 30
31 // A wrapper class that represents the Gtk dialog. 31 // A wrapper class that represents the Gtk dialog.
32 class HungRendererDialogGtk { 32 class HungRendererDialogGtk {
33 public: 33 public:
34 HungRendererDialogGtk(); 34 HungRendererDialogGtk();
35 virtual ~HungRendererDialogGtk() {}
35 void ShowForTabContents(TabContents* hung_contents); 36 void ShowForTabContents(TabContents* hung_contents);
36 void EndForTabContents(TabContents* hung_contents); 37 void EndForTabContents(TabContents* hung_contents);
37 38
38 private: 39 private:
39 // The GtkTreeView column ids. 40 // The GtkTreeView column ids.
40 enum { 41 enum {
41 COL_FAVICON, 42 COL_FAVICON,
42 COL_TITLE, 43 COL_TITLE,
43 COL_COUNT, 44 COL_COUNT,
44 }; 45 };
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 g_instance->ShowForTabContents(contents); 224 g_instance->ShowForTabContents(contents);
224 } 225 }
225 } 226 }
226 227
227 void HideHungRendererDialog(TabContents* contents) { 228 void HideHungRendererDialog(TabContents* contents) {
228 if (!logging::DialogsAreSuppressed() && g_instance) 229 if (!logging::DialogsAreSuppressed() && g_instance)
229 g_instance->EndForTabContents(contents); 230 g_instance->EndForTabContents(contents);
230 } 231 }
231 232
232 } // namespace browser 233 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698