ash/display/display_configuration_controller.cc - Issue 2725903003: chromeos: Move //ash/common/strings to //ash/strings

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: ash/display/display_configuration_controller.cc

Issue 2725903003: chromeos: Move //ash/common/strings to //ash/strings (Closed)

Patch Set: rebase Created 3 years, 9 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

« no previous file with comments | « ash/content/keyboard_overlay/keyboard_overlay_view.cc ('k') | ash/display/display_error_observer_chromeos.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 "ash/display/display_configuration_controller.h"	5 #include "ash/display/display_configuration_controller.h"

6	6

7 #include "ash/common/strings/grit/ash_strings.h"

8 #include "ash/display/display_animator.h"	7 #include "ash/display/display_animator.h"

9 #include "ash/display/display_animator_chromeos.h"	8 #include "ash/display/display_animator_chromeos.h"

10 #include "ash/display/display_util.h"	9 #include "ash/display/display_util.h"

11 #include "ash/rotator/screen_rotation_animator.h"	10 #include "ash/rotator/screen_rotation_animator.h"

	11 #include "ash/strings/grit/ash_strings.h"

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

13 #include "chromeos/system/devicemode.h"	13 #include "chromeos/system/devicemode.h"

14 #include "ui/base/l10n/l10n_util.h"	14 #include "ui/base/l10n/l10n_util.h"

15 #include "ui/display/display_layout.h"	15 #include "ui/display/display_layout.h"

16 #include "ui/display/manager/display_manager.h"	16 #include "ui/display/manager/display_manager.h"

17	17

18 namespace {	18 namespace {

19	19

20 // Specifies how long the display change should have been disabled	20 // Specifies how long the display change should have been disabled

21 // after each display change operations.	21 // after each display change operations.

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 }	165 }

166	166

167 void DisplayConfigurationController::SetPrimaryDisplayIdImpl(	167 void DisplayConfigurationController::SetPrimaryDisplayIdImpl(

168 int64_t display_id) {	168 int64_t display_id) {

169 window_tree_host_manager_->SetPrimaryDisplayId(display_id);	169 window_tree_host_manager_->SetPrimaryDisplayId(display_id);

170 if (display_animator_)	170 if (display_animator_)

171 display_animator_->StartFadeInAnimation();	171 display_animator_->StartFadeInAnimation();

172 }	172 }

173	173

174 } // namespace ash	174 } // namespace ash

OLD	NEW