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

Side by Side Diff: chrome/browser/chromeos/arc/settings_bridge.h

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
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 #ifndef CHROME_BROWSER_CHROMEOS_ARC_SETTINGS_BRIDGE_H_ 4 #ifndef CHROME_BROWSER_CHROMEOS_ARC_SETTINGS_BRIDGE_H_
5 #define CHROME_BROWSER_CHROMEOS_ARC_SETTINGS_BRIDGE_H_ 5 #define CHROME_BROWSER_CHROMEOS_ARC_SETTINGS_BRIDGE_H_
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/prefs/pref_change_registrar.h"
12 #include "base/values.h" 11 #include "base/values.h"
13 #include "chromeos/settings/timezone_settings.h" 12 #include "chromeos/settings/timezone_settings.h"
14 #include "components/arc/arc_bridge_service.h" 13 #include "components/arc/arc_bridge_service.h"
14 #include "components/prefs/pref_change_registrar.h"
15 15
16 namespace arc { 16 namespace arc {
17 17
18 namespace fontsizes { 18 namespace fontsizes {
19 19
20 // The following values were obtained from chrome://settings and Android's 20 // The following values were obtained from chrome://settings and Android's
21 // Display settings on Nov 2015. They are expected to remain stable. 21 // Display settings on Nov 2015. They are expected to remain stable.
22 const float kAndroidFontScaleSmall = 0.85; 22 const float kAndroidFontScaleSmall = 0.85;
23 const float kAndroidFontScaleNormal = 1; 23 const float kAndroidFontScaleNormal = 1;
24 const float kAndroidFontScaleLarge = 1.15; 24 const float kAndroidFontScaleLarge = 1.15;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 PrefChangeRegistrar registrar_; 86 PrefChangeRegistrar registrar_;
87 87
88 Delegate* const delegate_; 88 Delegate* const delegate_;
89 89
90 DISALLOW_COPY_AND_ASSIGN(SettingsBridge); 90 DISALLOW_COPY_AND_ASSIGN(SettingsBridge);
91 }; 91 };
92 92
93 } // namespace arc 93 } // namespace arc
94 94
95 #endif // CHROME_BROWSER_CHROMEOS_ARC_SETTINGS_BRIDGE_H_ 95 #endif // CHROME_BROWSER_CHROMEOS_ARC_SETTINGS_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698