chrome/browser/chromeos/login/merge_session_throttle.cc - Issue 12335051: Merge 182894 - 3rd attempt

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/chromeos/login/merge_session_throttle.cc

Issue 12335051: Merge 182894 - 3rd attempt (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 10 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/merge_session_throttle.h ('k') | chrome/browser/chromeos/login/mock_user_manager.h » ('j') | no next file with comments »

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/merge_session_throttle.h"

6	6

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

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

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

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

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94	94

95 bool MergeSessionThrottle::ShouldShowMergeSessionPage(const GURL& url) const {	95 bool MergeSessionThrottle::ShouldShowMergeSessionPage(const GURL& url) const {

96 // If we are loading google properties while merge session is in progress,	96 // If we are loading google properties while merge session is in progress,

97 // we will show delayed loading page instead.	97 // we will show delayed loading page instead.

98 return !net::NetworkChangeNotifier::IsOffline() &&	98 return !net::NetworkChangeNotifier::IsOffline() &&

99 google_util::IsGoogleHostname(url.host(),	99 google_util::IsGoogleHostname(url.host(),

100 google_util::ALLOW_SUBDOMAIN) &&	100 google_util::ALLOW_SUBDOMAIN) &&

101 chromeos::UserManager::Get()->GetMergeSessionState() ==	101 chromeos::UserManager::Get()->GetMergeSessionState() ==

102 chromeos::UserManager::MERGE_STATUS_IN_PROCESS;	102 chromeos::UserManager::MERGE_STATUS_IN_PROCESS;

103 }	103 }

OLD	NEW