chrome/browser/cocoa/location_bar/content_setting_decoration.mm - Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates.

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

Issue 3145001: FBTF: Clean up task.h in x11_util.h and header usage in some delegates. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: more Created 10 years, 4 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/cocoa/location_bar/content_setting_decoration.h"	5 #import "chrome/browser/cocoa/location_bar/content_setting_decoration.h"

6	6

7 #include "app/resource_bundle.h"	7 #include "app/resource_bundle.h"

8 #include "base/sys_string_conversions.h"	8 #include "base/sys_string_conversions.h"

	9 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/browser_list.h"	10 #include "chrome/browser/browser_list.h"

10 #import "chrome/browser/cocoa/content_blocked_bubble_controller.h"	11 #import "chrome/browser/cocoa/content_blocked_bubble_controller.h"

11 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"	12 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"

12 #include "chrome/browser/content_setting_image_model.h"	13 #include "chrome/browser/content_setting_image_model.h"

13 #include "chrome/browser/content_setting_bubble_model.h"	14 #include "chrome/browser/content_setting_bubble_model.h"

14 #include "chrome/browser/pref_service.h"	15 #include "chrome/browser/pref_service.h"

15 #include "chrome/browser/profile.h"	16 #include "chrome/browser/profile.h"

16 #include "chrome/browser/tab_contents/tab_contents.h"	17 #include "chrome/browser/tab_contents/tab_contents.h"

17 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

18 #include "net/base/net_util.h"	19 #include "net/base/net_util.h"

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
99 return true;	100 return true;

100 }	101 }

101	102

102 NSString* ContentSettingDecoration::GetToolTip() {	103 NSString* ContentSettingDecoration::GetToolTip() {

103 return tooltip_.get();	104 return tooltip_.get();

104 }	105 }

105	106

106 void ContentSettingDecoration::SetToolTip(NSString* tooltip) {	107 void ContentSettingDecoration::SetToolTip(NSString* tooltip) {

107 tooltip_.reset([tooltip retain]);	108 tooltip_.reset([tooltip retain]);

108 }	109 }

OLD	NEW