chrome/browser/chromeos/login/signin/merge_session_load_page.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common

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/signin/merge_session_load_page.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

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

6	6

	7 #include "ash/common/system/tray/system_tray_delegate.h"

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

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

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

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

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

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

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

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

15 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/chrome_notification_types.h"	16 #include "chrome/browser/chrome_notification_types.h"

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

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

19 #include "chrome/browser/profiles/profile.h"	19 #include "chrome/browser/profiles/profile.h"

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

167 << " be blocking now, "	167 << " be blocking now, "

168 << state;	168 << state;

169 if (!manager->ShouldBlockTabLoading()) {	169 if (!manager->ShouldBlockTabLoading()) {

170 manager->RemoveObserver(this);	170 manager->RemoveObserver(this);

171 interstitial_page_->Proceed();	171 interstitial_page_->Proceed();

172 }	172 }

173 }	173 }

174	174

175 } // namespace chromeos	175 } // namespace chromeos

OLD	NEW