chrome/browser/ui/ash/chrome_shell_content_state.cc - Issue 1960293003: Remove OS_CHROMEOS from ui/ash code

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/ui/ash/chrome_shell_content_state.cc

Issue 1960293003: Remove OS_CHROMEOS from ui/ash code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/ui/ash/chrome_shell_content_state.h"	5 #include "chrome/browser/ui/ash/chrome_shell_content_state.h"

6	6

7 #include "build/build_config.h"	7 #include "build/build_config.h"

8 #include "chrome/browser/profiles/profile_manager.h"	8 #include "chrome/browser/profiles/profile_manager.h"

	9 #include "components/user_manager/user_manager.h"

9 #include "content/public/browser/browser_context.h"	10 #include "content/public/browser/browser_context.h"

10	11

11 #if defined(OS_CHROMEOS)

12 #include "components/user_manager/user_manager.h"

13 #endif

14

15 ChromeShellContentState::ChromeShellContentState() {}	12 ChromeShellContentState::ChromeShellContentState() {}

16 ChromeShellContentState::~ChromeShellContentState() {}	13 ChromeShellContentState::~ChromeShellContentState() {}

17	14

18 content::BrowserContext* ChromeShellContentState::GetActiveBrowserContext() {	15 content::BrowserContext* ChromeShellContentState::GetActiveBrowserContext() {

19 #if defined(OS_CHROMEOS)

20 DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());	16 DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());

21 #endif

22 return ProfileManager::GetActiveUserProfile();	17 return ProfileManager::GetActiveUserProfile();

23 }	18 }

OLD	NEW