chrome/browser/views/hung_renderer_view.cc - Issue 24011: chrome_resources take 2

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/views/hung_renderer_view.cc

Issue 24011: chrome_resources take 2 (Closed)

Patch Set: rebase Created 11 years, 10 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

« no previous file with comments | « chrome/browser/views/frame/opaque_non_client_view.cc ('k') | chrome/browser/views/info_bubble.cc » ('j') | no next file with comments »

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

6	6

7 #include "chrome/app/result_codes.h"	7 #include "chrome/app/result_codes.h"

8 #include "chrome/app/theme/theme_resources.h"	8 #include "grit/theme_resources.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/views/standard_layout.h"	12 #include "chrome/browser/views/standard_layout.h"

13 #include "chrome/browser/tab_contents/web_contents.h"	13 #include "chrome/browser/tab_contents/web_contents.h"

14 #include "chrome/common/chrome_constants.h"	14 #include "chrome/common/chrome_constants.h"

15 #include "chrome/common/gfx/chrome_canvas.h"	15 #include "chrome/common/gfx/chrome_canvas.h"

16 #include "chrome/common/gfx/path.h"	16 #include "chrome/common/gfx/path.h"

17 #include "chrome/common/logging_chrome.h"	17 #include "chrome/common/logging_chrome.h"

18 #include "chrome/common/resource_bundle.h"	18 #include "chrome/common/resource_bundle.h"

(...skipping 425 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
444 instance_->ShowForWebContents(contents);	444 instance_->ShowForWebContents(contents);

445 }	445 }

446 }	446 }

447	447

448 // static	448 // static

449 void HungRendererWarning::HideForWebContents(WebContents* contents) {	449 void HungRendererWarning::HideForWebContents(WebContents* contents) {

450 if (!logging::DialogsAreSuppressed() && instance_)	450 if (!logging::DialogsAreSuppressed() && instance_)

451 instance_->EndForWebContents(contents);	451 instance_->EndForWebContents(contents);

452 }	452 }

453	453

OLD	NEW