Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

Issue 2290753004: Finish changing chrome/ grit includes to use qualified paths. (Closed)
Patch Set: Rebase, fix new unqualified include Created 4 years, 3 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
OLDNEW
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/options/chromeos/display_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "ash/common/strings/grit/ash_strings.h"
12 #include "ash/display/display_configuration_controller.h" 13 #include "ash/display/display_configuration_controller.h"
13 #include "ash/display/display_manager.h" 14 #include "ash/display/display_manager.h"
14 #include "ash/display/resolution_notification_controller.h" 15 #include "ash/display/resolution_notification_controller.h"
15 #include "ash/display/window_tree_host_manager.h" 16 #include "ash/display/window_tree_host_manager.h"
16 #include "ash/screen_util.h" 17 #include "ash/screen_util.h"
17 #include "ash/shell.h" 18 #include "ash/shell.h"
18 #include "base/bind.h" 19 #include "base/bind.h"
19 #include "base/command_line.h" 20 #include "base/command_line.h"
20 #include "base/logging.h" 21 #include "base/logging.h"
21 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
22 #include "base/strings/stringprintf.h" 23 #include "base/strings/stringprintf.h"
23 #include "base/values.h" 24 #include "base/values.h"
24 #include "chrome/browser/chromeos/display/display_preferences.h" 25 #include "chrome/browser/chromeos/display/display_preferences.h"
25 #include "chrome/grit/generated_resources.h" 26 #include "chrome/grit/generated_resources.h"
26 #include "chromeos/chromeos_switches.h" 27 #include "chromeos/chromeos_switches.h"
27 #include "content/public/browser/user_metrics.h" 28 #include "content/public/browser/user_metrics.h"
28 #include "content/public/browser/web_ui.h" 29 #include "content/public/browser/web_ui.h"
29 #include "grit/ash_strings.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/display/display.h" 31 #include "ui/display/display.h"
32 #include "ui/display/manager/display_layout.h" 32 #include "ui/display/manager/display_layout.h"
33 #include "ui/display/manager/display_layout_builder.h" 33 #include "ui/display/manager/display_layout_builder.h"
34 #include "ui/display/screen.h" 34 #include "ui/display/screen.h"
35 #include "ui/gfx/geometry/rect.h" 35 #include "ui/gfx/geometry/rect.h"
36 #include "ui/gfx/geometry/size_conversions.h" 36 #include "ui/gfx/geometry/size_conversions.h"
37 37
38 namespace chromeos { 38 namespace chromeos {
39 namespace options { 39 namespace options {
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 bool enable = false; 570 bool enable = false;
571 if (!args->GetBoolean(0, &enable)) 571 if (!args->GetBoolean(0, &enable))
572 NOTREACHED(); 572 NOTREACHED();
573 573
574 GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays( 574 GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
575 enable ? ash::DisplayManager::UNIFIED : ash::DisplayManager::EXTENDED); 575 enable ? ash::DisplayManager::UNIFIED : ash::DisplayManager::EXTENDED);
576 } 576 }
577 577
578 } // namespace options 578 } // namespace options
579 } // namespace chromeos 579 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698