chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc - Issue 2072013002: mash: Move tray settings and deps to 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/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. 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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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/ui/webui/chromeos/login/gaia_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"

6	6

7 #include "ash/system/chromeos/devicetype_utils.h"	7 #include "ash/common/system/chromeos/devicetype_utils.h"

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

9 #include "base/guid.h"	9 #include "base/guid.h"

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

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

12 #include "base/stl_util.h"	12 #include "base/stl_util.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/browser_shutdown.h"	16 #include "chrome/browser/browser_shutdown.h"

17 #include "chrome/browser/chromeos/input_method/input_method_util.h"	17 #include "chrome/browser/chromeos/input_method/input_method_util.h"

(...skipping 821 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
839 bool GaiaScreenHandler::IsRestrictiveProxy() const {	839 bool GaiaScreenHandler::IsRestrictiveProxy() const {

840 return !disable_restrictive_proxy_check_for_test_ &&	840 return !disable_restrictive_proxy_check_for_test_ &&

841 !IsOnline(captive_portal_status_);	841 !IsOnline(captive_portal_status_);

842 }	842 }

843	843

844 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {	844 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {

845 disable_restrictive_proxy_check_for_test_ = true;	845 disable_restrictive_proxy_check_for_test_ = true;

846 }	846 }

847	847

848 } // namespace chromeos	848 } // namespace chromeos

OLD	NEW