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/chromeos/display/display_preferences.h" | 5 #include "chrome/browser/chromeos/display/display_preferences.h" |
6 | 6 |
7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/prefs/pref_registry_simple.h" |
| 11 #include "base/prefs/pref_service.h" |
10 #include "base/string16.h" | 12 #include "base/string16.h" |
11 #include "base/string_util.h" | 13 #include "base/string_util.h" |
12 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
13 #include "base/values.h" | 15 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chromeos/login/user_manager.h" | 17 #include "chrome/browser/chromeos/login/user_manager.h" |
16 #include "chrome/browser/prefs/pref_registry_simple.h" | |
17 #include "chrome/browser/prefs/pref_service.h" | |
18 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
20 #include "googleurl/src/url_canon.h" | 20 #include "googleurl/src/url_canon.h" |
21 #include "googleurl/src/url_util.h" | 21 #include "googleurl/src/url_util.h" |
22 #include "ui/gfx/display.h" | 22 #include "ui/gfx/display.h" |
23 #include "ui/gfx/insets.h" | 23 #include "ui/gfx/insets.h" |
24 | 24 |
25 namespace chromeos { | 25 namespace chromeos { |
26 namespace { | 26 namespace { |
27 | 27 |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 | 217 |
218 void NotifyDisplayLocalStatePrefChanged() { | 218 void NotifyDisplayLocalStatePrefChanged() { |
219 PrefService* local_state = g_browser_process->local_state(); | 219 PrefService* local_state = g_browser_process->local_state(); |
220 ash::Shell::GetInstance()->display_controller()->SetPrimaryDisplayId( | 220 ash::Shell::GetInstance()->display_controller()->SetPrimaryDisplayId( |
221 local_state->GetInt64(prefs::kPrimaryDisplayID)); | 221 local_state->GetInt64(prefs::kPrimaryDisplayID)); |
222 NotifyDisplayLayoutChanged(); | 222 NotifyDisplayLayoutChanged(); |
223 NotifyDisplayOverscans(); | 223 NotifyDisplayOverscans(); |
224 } | 224 } |
225 | 225 |
226 } // namespace chromeos | 226 } // namespace chromeos |
OLD | NEW |