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/startup/startup_browser_creator_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #if defined(TOOLKIT_GTK) | 82 #if defined(TOOLKIT_GTK) |
83 #include "chrome/browser/ui/gtk/gtk_util.h" | 83 #include "chrome/browser/ui/gtk/gtk_util.h" |
84 #endif | 84 #endif |
85 | 85 |
86 #if defined(OS_WIN) | 86 #if defined(OS_WIN) |
87 #include "base/win/windows_version.h" | 87 #include "base/win/windows_version.h" |
88 #endif | 88 #endif |
89 | 89 |
90 using content::ChildProcessSecurityPolicy; | 90 using content::ChildProcessSecurityPolicy; |
91 using content::WebContents; | 91 using content::WebContents; |
| 92 using extensions::Extension; |
92 using protector::ProtectedPrefsWatcher; | 93 using protector::ProtectedPrefsWatcher; |
93 using protector::ProtectorService; | 94 using protector::ProtectorService; |
94 using protector::ProtectorServiceFactory; | 95 using protector::ProtectorServiceFactory; |
95 | 96 |
96 extern bool in_synchronous_profile_launch; | 97 extern bool in_synchronous_profile_launch; |
97 | 98 |
98 namespace { | 99 namespace { |
99 | 100 |
100 // Utility functions ---------------------------------------------------------- | 101 // Utility functions ---------------------------------------------------------- |
101 | 102 |
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 // New: | 857 // New: |
857 prefs->GetString(prefs::kHomePage), | 858 prefs->GetString(prefs::kHomePage), |
858 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), | 859 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), |
859 prefs->GetBoolean(prefs::kShowHomeButton), | 860 prefs->GetBoolean(prefs::kShowHomeButton), |
860 // Backup: | 861 // Backup: |
861 backup_homepage, | 862 backup_homepage, |
862 backup_homepage_is_ntp, | 863 backup_homepage_is_ntp, |
863 backup_show_home_button)); | 864 backup_show_home_button)); |
864 } | 865 } |
865 } | 866 } |
OLD | NEW |