chrome/browser/ui/webui/options/chromeos/display_options_handler.cc - Issue 10837331: Options: s/options2/options/.

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/options/chromeos/display_options_handler.cc

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wut Created 8 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/display_options_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/options2/chromeos/display_options_handler.h"	5 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "ash/display/display_controller.h"	9 #include "ash/display/display_controller.h"

10 #include "ash/display/output_configurator_animation.h"	10 #include "ash/display/output_configurator_animation.h"

11 #include "ash/shell.h"	11 #include "ash/shell.h"

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

13 #include "base/json/json_value_converter.h"	13 #include "base/json/json_value_converter.h"

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

15 #include "base/stringprintf.h"	15 #include "base/stringprintf.h"

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187 ash::Shell::GetInstance()->output_configurator_animation()->	187 ash::Shell::GetInstance()->output_configurator_animation()->

188 StartFadeOutAnimation(base::Bind(	188 StartFadeOutAnimation(base::Bind(

189 &DisplayOptionsHandler::FadeOutForDisplayLayoutFinished,	189 &DisplayOptionsHandler::FadeOutForDisplayLayoutFinished,

190 base::Unretained(this),	190 base::Unretained(this),

191 static_cast<int>(layout),	191 static_cast<int>(layout),

192 static_cast<int>(offset)));	192 static_cast<int>(offset)));

193 }	193 }

194	194

195 } // namespace options	195 } // namespace options

196 } // namespace chromeos	196 } // namespace chromeos

OLD	NEW