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

Side by Side Diff: chrome/browser/defaults.cc

Issue 335047: Revert 30194 - Makes session restore on Chrome OS restore popups.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/defaults.h ('k') | chrome/browser/sessions/session_restore_uitest.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/defaults.h" 5 #include "chrome/browser/defaults.h"
6 6
7 namespace browser_defaults { 7 namespace browser_defaults {
8 8
9 #if defined(OS_CHROMEOS) 9 #if defined(OS_CHROMEOS)
10 10
11 const double kAutocompleteEditFontPixelSize = 12.0; 11 const double kAutocompleteEditFontPixelSize = 12.0;
12 const double kAutocompleteEditFontPixelSizeInPopup = kAutocompletePopupFontSize; 12 const double kAutocompleteEditFontPixelSizeInPopup = kAutocompletePopupFontSize;
13 13
14 const int kAutocompletePopupFontSize = 7; 14 const int kAutocompletePopupFontSize = 7;
15 const SessionStartupPref::Type kDefaultSessionStartupType = 15 const SessionStartupPref::Type kDefaultSessionStartupType =
16 SessionStartupPref::LAST; 16 SessionStartupPref::LAST;
17 const int kPinnedTabWidth = 64; 17 const int kPinnedTabWidth = 64;
18 const bool kCanToggleSystemTitleBar = false; 18 const bool kCanToggleSystemTitleBar = false;
19 const bool kRestorePopups = true;
20 19
21 #elif defined(OS_LINUX) 20 #elif defined(OS_LINUX)
22 21
23 // 13.4px = 10pt @ 96dpi. 22 // 13.4px = 10pt @ 96dpi.
24 const double kAutocompleteEditFontPixelSize = 13.4; 23 const double kAutocompleteEditFontPixelSize = 13.4;
25 24
26 // On Windows, popup windows' autocomplete box have a font 5/6 the size of a 25 // On Windows, popup windows' autocomplete box have a font 5/6 the size of a
27 // regular window, which we duplicate here for GTK. 26 // regular window, which we duplicate here for GTK.
28 const double kAutocompleteEditFontPixelSizeInPopup = 27 const double kAutocompleteEditFontPixelSizeInPopup =
29 kAutocompleteEditFontPixelSize * 5.0 / 6.0; 28 kAutocompleteEditFontPixelSize * 5.0 / 6.0;
30 29
31 const int kAutocompletePopupFontSize = 10; 30 const int kAutocompletePopupFontSize = 10;
32 31
33 #if defined(TOOLKIT_VIEWS) 32 #if defined(TOOLKIT_VIEWS)
34 const bool kCanToggleSystemTitleBar = false; 33 const bool kCanToggleSystemTitleBar = false;
35 #else 34 #else
36 const bool kCanToggleSystemTitleBar = true; 35 const bool kCanToggleSystemTitleBar = true;
37 #endif 36 #endif
38 37
39 #endif 38 #endif
40 39
41 #if !defined(OS_CHROMEOS) 40 #if !defined(OS_CHROMEOS)
42 41
43 const SessionStartupPref::Type kDefaultSessionStartupType = 42 const SessionStartupPref::Type kDefaultSessionStartupType =
44 SessionStartupPref::DEFAULT; 43 SessionStartupPref::DEFAULT;
45 const int kPinnedTabWidth = 56; 44 const int kPinnedTabWidth = 56;
46 const bool kRestorePopups = false;
47 45
48 #endif 46 #endif
49 47
50 } // namespace browser_defaults 48 } // namespace browser_defaults
OLDNEW
« no previous file with comments | « chrome/browser/defaults.h ('k') | chrome/browser/sessions/session_restore_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698