chrome/browser/chromeos/login/merge_session_load_page.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_load_page.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:

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"

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

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

143 << state;	143 << state;

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

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

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

147 }	147 }

148 }	148 }

149	149

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

OLD	NEW