chrome/browser/chromeos/login/signin/merge_session_throttle.cc - Issue 286933002: [cros login] Split login related classes into subfolders.

Side by Side Diff: chrome/browser/chromeos/login/signin/merge_session_throttle.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix includes in new tests Created 6 years, 7 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/chromeos/login/signin/merge_session_throttle.h ('k') | chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/chromeos/login/merge_session_throttle.h"	5 #include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

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

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

10 #include "base/memory/singleton.h"	10 #include "base/memory/singleton.h"

11 #include "base/metrics/histogram.h"	11 #include "base/metrics/histogram.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

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

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

15 #include "chrome/browser/chromeos/login/merge_session_load_page.h"	15 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"

16 #include "chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h"	16 #include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter. h"

17 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"	17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

18 #include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"	18 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"

19 #include "chrome/browser/chromeos/login/user_manager.h"	19 #include "chrome/browser/chromeos/login/users/user_manager.h"

20 #include "chrome/browser/chromeos/login/user_manager.h"	20 #include "chrome/browser/chromeos/login/users/user_manager.h"

21 #include "chrome/browser/google/google_util.h"	21 #include "chrome/browser/google/google_util.h"

22 #include "chrome/browser/net/chrome_url_request_context.h"	22 #include "chrome/browser/net/chrome_url_request_context.h"

23 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

24 #include "content/public/browser/browser_thread.h"	24 #include "content/public/browser/browser_thread.h"

25 #include "content/public/browser/render_view_host.h"	25 #include "content/public/browser/render_view_host.h"

26 #include "content/public/browser/resource_controller.h"	26 #include "content/public/browser/resource_controller.h"

27 #include "content/public/browser/resource_request_info.h"	27 #include "content/public/browser/resource_request_info.h"

28 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

29 #include "net/base/net_errors.h"	29 #include "net/base/net_errors.h"

30 #include "net/base/net_util.h"	30 #include "net/base/net_util.h"

(...skipping 235 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
266 Profile* profile = Profile::FromBrowserContext(	266 Profile* profile = Profile::FromBrowserContext(

267 web_contents->GetBrowserContext());	267 web_contents->GetBrowserContext());

268 (new chromeos::MergeSessionXHRRequestWaiter(profile,	268 (new chromeos::MergeSessionXHRRequestWaiter(profile,

269 callback))->StartWaiting();	269 callback))->StartWaiting();

270 }	270 }

271 } else {	271 } else {

272 BrowserThread::PostTask(	272 BrowserThread::PostTask(

273 BrowserThread::IO, FROM_HERE, callback);	273 BrowserThread::IO, FROM_HERE, callback);

274 }	274 }

275 }	275 }

OLD	NEW