chrome/browser/ui/cocoa/hung_renderer_controller.mm - Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h.

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/cocoa/hung_renderer_controller.mm

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/ui/cocoa/first_run_dialog.mm ('k') | chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm » ('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 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h"	5 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h"

6	6

7 #import <Cocoa/Cocoa.h>	7 #import <Cocoa/Cocoa.h>

8	8

9 #include "base/mac/bundle_locations.h"	9 #include "base/mac/bundle_locations.h"

10 #include "base/mac/mac_util.h"

11 #include "base/strings/sys_string_conversions.h"	10 #include "base/strings/sys_string_conversions.h"

12 #include "chrome/browser/favicon/favicon_tab_helper.h"	11 #include "chrome/browser/favicon/favicon_tab_helper.h"

13 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h"	12 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h"

14 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"	13 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"

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

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

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

18 #include "content/public/browser/render_process_host.h"	17 #include "content/public/browser/render_process_host.h"

19 #include "content/public/browser/render_view_host.h"	18 #include "content/public/browser/render_view_host.h"

20 #include "content/public/browser/web_contents.h"	19 #include "content/public/browser/web_contents.h"

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
223	222

224 @implementation HungRendererController (JustForTesting)	223 @implementation HungRendererController (JustForTesting)

225 - (NSButton*)killButton {	224 - (NSButton*)killButton {

226 return killButton_;	225 return killButton_;

227 }	226 }

228	227

229 - (MultiKeyEquivalentButton*)waitButton {	228 - (MultiKeyEquivalentButton*)waitButton {

230 return waitButton_;	229 return waitButton_;

231 }	230 }

232 @end	231 @end

OLD	NEW