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 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
884 PinnedTabCodec::ReadPinnedTabs(tabs_backup))); | 884 PinnedTabCodec::ReadPinnedTabs(tabs_backup))); |
885 } | 885 } |
886 | 886 |
887 // Check for homepage changes. | 887 // Check for homepage changes. |
888 if (prefs_watcher->DidPrefChange(prefs::kHomePage) || | 888 if (prefs_watcher->DidPrefChange(prefs::kHomePage) || |
889 prefs_watcher->DidPrefChange(prefs::kHomePageIsNewTabPage) || | 889 prefs_watcher->DidPrefChange(prefs::kHomePageIsNewTabPage) || |
890 prefs_watcher->DidPrefChange(prefs::kShowHomeButton)) { | 890 prefs_watcher->DidPrefChange(prefs::kShowHomeButton)) { |
891 LOG(WARNING) << "Homepage has changed"; | 891 LOG(WARNING) << "Homepage has changed"; |
892 PrefService* prefs = profile->GetPrefs(); | 892 PrefService* prefs = profile->GetPrefs(); |
893 std::string backup_homepage; | 893 std::string backup_homepage; |
894 bool backup_homepage_is_ntp; | 894 bool backup_homepage_is_ntp = false; |
895 bool backup_show_home_button; | 895 bool backup_show_home_button = false; |
896 if (!prefs_watcher->GetBackupForPref(prefs::kHomePage)-> | 896 if (!prefs_watcher->GetBackupForPref(prefs::kHomePage)-> |
897 GetAsString(&backup_homepage) || | 897 GetAsString(&backup_homepage) || |
898 !prefs_watcher->GetBackupForPref(prefs::kHomePageIsNewTabPage)-> | 898 !prefs_watcher->GetBackupForPref(prefs::kHomePageIsNewTabPage)-> |
899 GetAsBoolean(&backup_homepage_is_ntp) || | 899 GetAsBoolean(&backup_homepage_is_ntp) || |
900 !prefs_watcher->GetBackupForPref(prefs::kShowHomeButton)-> | 900 !prefs_watcher->GetBackupForPref(prefs::kShowHomeButton)-> |
901 GetAsBoolean(&backup_show_home_button)) { | 901 GetAsBoolean(&backup_show_home_button)) { |
902 NOTREACHED(); | 902 NOTREACHED(); |
903 } | 903 } |
904 protector_service->ShowChange(protector::CreateHomepageChange( | 904 protector_service->ShowChange(protector::CreateHomepageChange( |
905 // New: | 905 // New: |
906 prefs->GetString(prefs::kHomePage), | 906 prefs->GetString(prefs::kHomePage), |
907 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), | 907 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), |
908 prefs->GetBoolean(prefs::kShowHomeButton), | 908 prefs->GetBoolean(prefs::kShowHomeButton), |
909 // Backup: | 909 // Backup: |
910 backup_homepage, | 910 backup_homepage, |
911 backup_homepage_is_ntp, | 911 backup_homepage_is_ntp, |
912 backup_show_home_button)); | 912 backup_show_home_button)); |
913 } | 913 } |
914 } | 914 } |
OLD | NEW |