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

Side by Side Diff: chrome/browser/ui/browser_view_prefs.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « chrome/browser/ui/browser_ui_prefs.cc ('k') | chrome/browser/ui/browser_window_state.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser_view_prefs.h" 5 #include "chrome/browser/ui/browser_view_prefs.h"
6 6
7 #include "base/prefs/pref_registry_simple.h"
8 #include "base/prefs/pref_service.h"
9 #include "build/build_config.h" 7 #include "build/build_config.h"
10 #include "chrome/common/pref_names.h" 8 #include "chrome/common/pref_names.h"
11 #include "components/pref_registry/pref_registry_syncable.h" 9 #include "components/pref_registry/pref_registry_syncable.h"
10 #include "components/prefs/pref_registry_simple.h"
11 #include "components/prefs/pref_service.h"
12 12
13 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 13 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
14 #include "ui/base/x/x11_util.h" 14 #include "ui/base/x/x11_util.h"
15 #endif 15 #endif
16 16
17 namespace { 17 namespace {
18 18
19 // How long do we wait before we consider a window hung (in ms). 19 // How long do we wait before we consider a window hung (in ms).
20 const int kDefaultPluginMessageResponseTimeout = 25000; 20 const int kDefaultPluginMessageResponseTimeout = 25000;
21 21
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 void MigrateBrowserTabStripPrefs(PrefService* prefs) { 54 void MigrateBrowserTabStripPrefs(PrefService* prefs) {
55 if (prefs->HasPrefPath(kTabStripLayoutType)) { 55 if (prefs->HasPrefPath(kTabStripLayoutType)) {
56 prefs->SetBoolean(prefs::kTabStripStackedLayout, 56 prefs->SetBoolean(prefs::kTabStripStackedLayout,
57 prefs->GetInteger(kTabStripLayoutType) != 0); 57 prefs->GetInteger(kTabStripLayoutType) != 0);
58 prefs->ClearPref(kTabStripLayoutType); 58 prefs->ClearPref(kTabStripLayoutType);
59 } 59 }
60 } 60 }
61 61
62 } // namespace chrome 62 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_ui_prefs.cc ('k') | chrome/browser/ui/browser_window_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698