chrome/browser/captive_portal/captive_portal_service.h - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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/captive_portal/captive_portal_service.h

Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 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 | Annotate | Revision Log

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_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_	5 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_

6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_	6 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_

7	7

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

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

10 #include "base/threading/non_thread_safe.h"	10 #include "base/threading/non_thread_safe.h"

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

12 #include "base/timer.h"	12 #include "base/timer.h"

13 #include "chrome/browser/prefs/pref_member.h"	13 #include "chrome/browser/api/prefs/pref_member.h"

14 #include "chrome/browser/profiles/profile_keyed_service.h"	14 #include "chrome/browser/profiles/profile_keyed_service.h"

15 #include "content/public/browser/notification_observer.h"	15 #include "content/public/browser/notification_observer.h"

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

17 #include "net/base/backoff_entry.h"	17 #include "net/base/backoff_entry.h"

18 #include "net/url_request/url_fetcher_delegate.h"	18 #include "net/url_request/url_fetcher_delegate.h"

19	19

20 class Profile;	20 class Profile;

21	21

22 namespace net {	22 namespace net {

23 class URLFetcher;	23 class URLFetcher;

(...skipping 195 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
219 base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;	219 base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;

220	220

221 static bool is_disabled_for_testing_;	221 static bool is_disabled_for_testing_;

222	222

223 DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);	223 DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);

224 };	224 };

225	225

226 } // namespace captive_portal	226 } // namespace captive_portal

227	227

228 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_	228 #endif // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_

OLD	NEW