chrome/browser/ui/webui/chromeos/login/error_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/error_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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/error_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/error_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/message_loop/message_loop.h"	8 #include "base/message_loop/message_loop.h"

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

10 #include "chrome/browser/chromeos/login/screens/network_error_model.h"	10 #include "chrome/browser/chromeos/login/screens/network_error_model.h"

11 #include "chrome/grit/chromium_strings.h"	11 #include "chrome/grit/chromium_strings.h"

12 #include "chrome/grit/generated_resources.h"	12 #include "chrome/grit/generated_resources.h"

13 #include "components/login/localized_values_builder.h"	13 #include "components/login/localized_values_builder.h"

14 #include "ui/strings/grit/ui_strings.h"	14 #include "ui/strings/grit/ui_strings.h"

15	15

16 namespace {	16 namespace {

17	17

(...skipping 110 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128 show_on_init_ = false;	128 show_on_init_ = false;

129 }	129 }

130 }	130 }

131	131

132 void ErrorScreenHandler::OnConnectToNetworkRequested() {	132 void ErrorScreenHandler::OnConnectToNetworkRequested() {

133 if (showing_ && model_)	133 if (showing_ && model_)

134 model_->OnUserAction(NetworkErrorModel::kUserActionConnectRequested);	134 model_->OnUserAction(NetworkErrorModel::kUserActionConnectRequested);

135 }	135 }

136	136

137 } // namespace chromeos	137 } // namespace chromeos

OLD	NEW

« ash/common/DEPS ('K') | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »