chrome/browser/ui/website_settings/website_settings.h - Issue 10958031: Move cancelable_request.cc/h to chrome/browser/common.

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/website_settings/website_settings.h

Issue 10958031: Move cancelable_request.cc/h to chrome/browser/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 3 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/download/download_item_view.h ('k') | chrome/browser/ui/webui/history_ui.h » ('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 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_	5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_

6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_	6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/string16.h"	9 #include "base/string16.h"

10 #include "base/time.h"	10 #include "base/time.h"

11 #include "chrome/browser/cancelable_request.h"	11 #include "chrome/browser/common/cancelable_request.h"

12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

13 #include "chrome/browser/history/history.h"	13 #include "chrome/browser/history/history.h"

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

15 #include "chrome/common/content_settings_types.h"	15 #include "chrome/common/content_settings_types.h"

16 #include "googleurl/src/gurl.h"	16 #include "googleurl/src/gurl.h"

17 #include "ui/gfx/native_widget_types.h"	17 #include "ui/gfx/native_widget_types.h"

18	18

19 namespace content {	19 namespace content {

20 class CertStore;	20 class CertStore;

21 struct SSLStatus;	21 struct SSLStatus;

(...skipping 169 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
191 // content settings (aka. site permissions).	191 // content settings (aka. site permissions).

192 HostContentSettingsMap* content_settings_;	192 HostContentSettingsMap* content_settings_;

193	193

194 // Used to request the number of page visits.	194 // Used to request the number of page visits.

195 CancelableRequestConsumer visit_count_request_consumer_;	195 CancelableRequestConsumer visit_count_request_consumer_;

196	196

197 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);	197 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);

198 };	198 };

199	199

200 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_	200 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_

OLD	NEW