OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 2022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2033 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 2033 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
2034 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 2034 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
2035 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 2035 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
2036 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 2036 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
2037 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2037 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
2038 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2038 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
2039 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2039 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
2040 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2040 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
2041 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); | 2041 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); |
2042 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); | 2042 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); |
2043 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | |
2044 } | 2043 } |
2045 | 2044 |
2046 // static | 2045 // static |
2047 bool Browser::RunUnloadEventsHelper(TabContents* contents) { | 2046 bool Browser::RunUnloadEventsHelper(TabContents* contents) { |
2048 // If the TabContents is not connected yet, then there's no unload | 2047 // If the TabContents is not connected yet, then there's no unload |
2049 // handler we can fire even if the TabContents has an unload listener. | 2048 // handler we can fire even if the TabContents has an unload listener. |
2050 // One case where we hit this is in a tab that has an infinite loop | 2049 // One case where we hit this is in a tab that has an infinite loop |
2051 // before load. | 2050 // before load. |
2052 if (contents->NeedToFireBeforeUnload()) { | 2051 if (contents->NeedToFireBeforeUnload()) { |
2053 // If the page has unload listeners, then we tell the renderer to fire | 2052 // If the page has unload listeners, then we tell the renderer to fire |
(...skipping 2151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4205 // The page transition below is only for the purpose of inserting the tab. | 4204 // The page transition below is only for the purpose of inserting the tab. |
4206 browser->AddTab(contents_dupe, PageTransition::LINK); | 4205 browser->AddTab(contents_dupe, PageTransition::LINK); |
4207 } | 4206 } |
4208 | 4207 |
4209 if (profile_->HasSessionService()) { | 4208 if (profile_->HasSessionService()) { |
4210 SessionService* session_service = profile_->GetSessionService(); | 4209 SessionService* session_service = profile_->GetSessionService(); |
4211 if (session_service) | 4210 if (session_service) |
4212 session_service->TabRestored(&new_contents->controller(), pinned); | 4211 session_service->TabRestored(&new_contents->controller(), pinned); |
4213 } | 4212 } |
4214 } | 4213 } |
OLD | NEW |