chrome/browser/ui/views/hung_renderer_view.cc - Issue 137993009: Remove more non-aura windows code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 137993009: Remove more non-aura windows code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: renable the disabled tests Created 6 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/frame/browser_view.cc ('k') | chrome/browser/ui/views/keyboard_access_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/views/hung_renderer_view.h"	5 #include "chrome/browser/ui/views/hung_renderer_view.h"

6	6

7 #if defined(OS_WIN) && !defined(USE_AURA)

8 #include <windows.h>

9 #endif

10

11 #include "base/i18n/rtl.h"	7 #include "base/i18n/rtl.h"

12 #include "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

13 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

14 #include "chrome/browser/favicon/favicon_tab_helper.h"	10 #include "chrome/browser/favicon/favicon_tab_helper.h"

15 #include "chrome/browser/platform_util.h"	11 #include "chrome/browser/platform_util.h"

16 #include "chrome/browser/ui/browser_dialogs.h"	12 #include "chrome/browser/ui/browser_dialogs.h"

17 #include "chrome/browser/ui/browser_finder.h"	13 #include "chrome/browser/ui/browser_finder.h"

18 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"	14 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"

19 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"	15 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"

20 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"	16 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"

(...skipping 451 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
472 }	468 }

473	469

474 void HideHungRendererDialog(WebContents* contents) {	470 void HideHungRendererDialog(WebContents* contents) {

475 if (!logging::DialogsAreSuppressed() &&	471 if (!logging::DialogsAreSuppressed() &&

476 !PlatformHideCustomHungRendererDialog(contents) &&	472 !PlatformHideCustomHungRendererDialog(contents) &&

477 HungRendererDialogView::GetInstance())	473 HungRendererDialogView::GetInstance())

478 HungRendererDialogView::GetInstance()->EndForWebContents(contents);	474 HungRendererDialogView::GetInstance()->EndForWebContents(contents);

479 }	475 }

480	476

481 } // namespace chrome	477 } // namespace chrome

OLD	NEW