summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:04:06 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:04:06 +0000
commit88c50ab803907cb0ea0c7acc14f94dbb267d473f (patch)
treedde8db67ef4e94abc64f700adc38cfdc1a88a9d6 /chrome/test
parent5a9b083b725c8f9b40ad53ad6cc0f97e8f6d211b (diff)
downloadchromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.zip
chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.tar.gz
chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.tar.bz2
GTK: Turn on the GTK+ integration by default.
This will regress default startup time for users by 50ms. This doesn't matter because this is what the users want--I've lost count of the number bloggers, people on twitter, and people in our IRC channel complaining about the lack of GTK+ integration...when it's just not on by default. BUG=none TEST=none Review URL: http://codereview.chromium.org/1442001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/profiles/chrome_prefs/Preferences5
-rw-r--r--chrome/test/data/profiles/custom_frame/Default/Preferences5
-rw-r--r--chrome/test/data/profiles/sample/Preferences9
-rw-r--r--chrome/test/data/profiles/typical_history/Default/Preferences5
4 files changed, 23 insertions, 1 deletions
diff --git a/chrome/test/data/profiles/chrome_prefs/Preferences b/chrome/test/data/profiles/chrome_prefs/Preferences
index 937b1e39..4510e2f 100644
--- a/chrome/test/data/profiles/chrome_prefs/Preferences
+++ b/chrome/test/data/profiles/chrome_prefs/Preferences
@@ -1,4 +1,9 @@
{
+ "extensions": {
+ "theme": {
+ "use_system": false
+ }
+ },
"intl": {
"charset_default": "utf8"
},
diff --git a/chrome/test/data/profiles/custom_frame/Default/Preferences b/chrome/test/data/profiles/custom_frame/Default/Preferences
index 26dc297..d9929da 100644
--- a/chrome/test/data/profiles/custom_frame/Default/Preferences
+++ b/chrome/test/data/profiles/custom_frame/Default/Preferences
@@ -1,4 +1,9 @@
{
+ "extensions": {
+ "theme": {
+ "use_system": false
+ }
+ },
"browser": {
"custom_chrome_frame": true
},
diff --git a/chrome/test/data/profiles/sample/Preferences b/chrome/test/data/profiles/sample/Preferences
index 19765bd..6e9ca31 100644
--- a/chrome/test/data/profiles/sample/Preferences
+++ b/chrome/test/data/profiles/sample/Preferences
@@ -1 +1,8 @@
-null
+{
+ "extensions": {
+ "theme": {
+ "use_system": false
+ }
+ }
+}
+
diff --git a/chrome/test/data/profiles/typical_history/Default/Preferences b/chrome/test/data/profiles/typical_history/Default/Preferences
index e56c782..a924d9c 100644
--- a/chrome/test/data/profiles/typical_history/Default/Preferences
+++ b/chrome/test/data/profiles/typical_history/Default/Preferences
@@ -1,4 +1,9 @@
{
+ "extensions": {
+ "theme": {
+ "use_system": false
+ }
+ },
"profile": {
"exited_cleanly": true,
"id": "not-signed-in",