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 2029 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2040 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 2040 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
2041 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 2041 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
2042 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 2042 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
2043 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2043 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
2044 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2044 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
2045 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2045 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
2046 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2046 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
2047 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); | 2047 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); |
2048 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); | 2048 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); |
2049 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 2049 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 2050 // We need to register the type of this preference in order to query |
| 2051 // it even though it's only typically controlled via policy. |
| 2052 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false); |
2050 } | 2053 } |
2051 | 2054 |
2052 // static | 2055 // static |
2053 bool Browser::RunUnloadEventsHelper(TabContents* contents) { | 2056 bool Browser::RunUnloadEventsHelper(TabContents* contents) { |
2054 // If the TabContents is not connected yet, then there's no unload | 2057 // If the TabContents is not connected yet, then there's no unload |
2055 // handler we can fire even if the TabContents has an unload listener. | 2058 // handler we can fire even if the TabContents has an unload listener. |
2056 // One case where we hit this is in a tab that has an infinite loop | 2059 // One case where we hit this is in a tab that has an infinite loop |
2057 // before load. | 2060 // before load. |
2058 if (contents->NeedToFireBeforeUnload()) { | 2061 if (contents->NeedToFireBeforeUnload()) { |
2059 // If the page has unload listeners, then we tell the renderer to fire | 2062 // If the page has unload listeners, then we tell the renderer to fire |
(...skipping 2156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4216 // The page transition below is only for the purpose of inserting the tab. | 4219 // The page transition below is only for the purpose of inserting the tab. |
4217 browser->AddTab(contents_dupe, PageTransition::LINK); | 4220 browser->AddTab(contents_dupe, PageTransition::LINK); |
4218 } | 4221 } |
4219 | 4222 |
4220 if (profile_->HasSessionService()) { | 4223 if (profile_->HasSessionService()) { |
4221 SessionService* session_service = profile_->GetSessionService(); | 4224 SessionService* session_service = profile_->GetSessionService(); |
4222 if (session_service) | 4225 if (session_service) |
4223 session_service->TabRestored(&new_contents->controller(), pinned); | 4226 session_service->TabRestored(&new_contents->controller(), pinned); |
4224 } | 4227 } |
4225 } | 4228 } |
OLD | NEW |