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

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

Issue 6382009: views: Move grid_layout files into layout directory. Final Part. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/generic_info_view.cc ('k') | chrome/browser/ui/views/importer_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/hung_renderer_dialog.h" 5 #include "chrome/browser/hung_renderer_dialog.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
10 #include "chrome/browser/renderer_host/render_process_host.h" 10 #include "chrome/browser/renderer_host/render_process_host.h"
11 #include "chrome/browser/renderer_host/render_view_host.h" 11 #include "chrome/browser/renderer_host/render_view_host.h"
12 #include "chrome/browser/tab_contents/tab_contents.h" 12 #include "chrome/browser/tab_contents/tab_contents.h"
13 #include "chrome/common/chrome_constants.h" 13 #include "chrome/common/chrome_constants.h"
14 #include "chrome/common/logging_chrome.h" 14 #include "chrome/common/logging_chrome.h"
15 #include "chrome/common/result_codes.h" 15 #include "chrome/common/result_codes.h"
16 #include "gfx/canvas.h" 16 #include "gfx/canvas.h"
17 #include "grit/chromium_strings.h" 17 #include "grit/chromium_strings.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
22 #include "views/grid_layout.h"
23 #include "views/controls/button/native_button.h" 22 #include "views/controls/button/native_button.h"
24 #include "views/controls/image_view.h" 23 #include "views/controls/image_view.h"
25 #include "views/controls/label.h" 24 #include "views/controls/label.h"
26 #include "views/controls/table/group_table_view.h" 25 #include "views/controls/table/group_table_view.h"
26 #include "views/layout/grid_layout.h"
27 #include "views/layout/layout_constants.h" 27 #include "views/layout/layout_constants.h"
28 #include "views/window/client_view.h" 28 #include "views/window/client_view.h"
29 #include "views/window/dialog_delegate.h" 29 #include "views/window/dialog_delegate.h"
30 #include "views/window/window.h" 30 #include "views/window/window.h"
31 31
32 class HungRendererDialogView; 32 class HungRendererDialogView;
33 33
34 namespace { 34 namespace {
35 // We only support showing one of these at a time per app. 35 // We only support showing one of these at a time per app.
36 HungRendererDialogView* g_instance = NULL; 36 HungRendererDialogView* g_instance = NULL;
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 } 469 }
470 470
471 // static 471 // static
472 void HideForTabContents(TabContents* contents) { 472 void HideForTabContents(TabContents* contents) {
473 if (!logging::DialogsAreSuppressed() && g_instance) 473 if (!logging::DialogsAreSuppressed() && g_instance)
474 g_instance->EndForTabContents(contents); 474 g_instance->EndForTabContents(contents);
475 } 475 }
476 476
477 } // namespace hung_renderer_dialog 477 } // namespace hung_renderer_dialog
478 478
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/generic_info_view.cc ('k') | chrome/browser/ui/views/importer_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698