| 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/browser_view_prefs.h" | 5 #include "chrome/browser/ui/browser_view_prefs.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_registry_simple.h" | 7 #include "base/prefs/pref_registry_simple.h" |
| 8 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
| 9 #include "components/user_prefs/pref_registry_syncable.h" | 9 #include "components/pref_registry/pref_registry_syncable.h" |
| 10 | 10 |
| 11 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 11 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 12 #include "ui/base/x/x11_util.h" | 12 #include "ui/base/x/x11_util.h" |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // How long do we wait before we consider a window hung (in ms). | 17 // How long do we wait before we consider a window hung (in ms). |
| 18 const int kDefaultPluginMessageResponseTimeout = 25000; | 18 const int kDefaultPluginMessageResponseTimeout = 25000; |
| 19 | 19 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 38 custom_frame_default = ui::GetCustomFramePrefDefault(); | 38 custom_frame_default = ui::GetCustomFramePrefDefault(); |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 registry->RegisterBooleanPref( | 41 registry->RegisterBooleanPref( |
| 42 prefs::kUseCustomChromeFrame, | 42 prefs::kUseCustomChromeFrame, |
| 43 custom_frame_default, | 43 custom_frame_default, |
| 44 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 44 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 45 } | 45 } |
| 46 | 46 |
| 47 } // namespace chrome | 47 } // namespace chrome |
| OLD | NEW |