chrome/browser/chromeos/login/merge_session_load_page.cc - Issue 15899015: Add CheckPortalList manager property to NetworkStateHandler

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_load_page.cc

Issue 15899015: Add CheckPortalList manager property to NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: force manager property update in shill manager client stub implementation Created 7 years, 6 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/cros/network_library_impl_stub.cc ('k') | chrome/browser/chromeos/login/screens/update_screen_browsertest.cc » ('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_load_page.h"	5 #include "chrome/browser/chromeos/login/merge_session_load_page.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_delegate.h"	8 #include "ash/shell_delegate.h"

9 #include "ash/system/tray/system_tray_delegate.h"	9 #include "ash/system/tray/system_tray_delegate.h"

10 #include "base/i18n/rtl.h"	10 #include "base/i18n/rtl.h"

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

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

13 #include "base/strings/string_piece.h"	13 #include "base/strings/string_piece.h"

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

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/chromeos/cros/cros_library.h"

17 #include "chrome/browser/chromeos/cros/network_library.h"

18 #include "chrome/browser/extensions/extension_service.h"	16 #include "chrome/browser/extensions/extension_service.h"

19 #include "chrome/browser/extensions/extension_system.h"	17 #include "chrome/browser/extensions/extension_system.h"

20 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/renderer_preferences_util.h"	19 #include "chrome/browser/renderer_preferences_util.h"

22 #include "chrome/browser/tab_contents/tab_util.h"	20 #include "chrome/browser/tab_contents/tab_util.h"

23 #include "chrome/common/chrome_notification_types.h"	21 #include "chrome/common/chrome_notification_types.h"

24 #include "chrome/common/extensions/extension.h"	22 #include "chrome/common/extensions/extension.h"

25 #include "chrome/common/extensions/extension_constants.h"	23 #include "chrome/common/extensions/extension_constants.h"

26 #include "chrome/common/extensions/extension_icon_set.h"	24 #include "chrome/common/extensions/extension_icon_set.h"

27 #include "chrome/common/url_constants.h"	25 #include "chrome/common/url_constants.h"

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 " NOT " : "")	139 " NOT " : "")

142 << " in progress, "	140 << " in progress, "

143 << state;	141 << state;

144 if (state != UserManager:: MERGE_STATUS_IN_PROCESS) {	142 if (state != UserManager:: MERGE_STATUS_IN_PROCESS) {

145 UserManager::Get()->RemoveObserver(this);	143 UserManager::Get()->RemoveObserver(this);

146 interstitial_page_->Proceed();	144 interstitial_page_->Proceed();

147 }	145 }

148 }	146 }

149	147

150 } // namespace chromeos	148 } // namespace chromeos

OLD	NEW