OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2081 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2081 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
2082 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2082 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
2083 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2083 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
2084 prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); | 2084 prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); |
2085 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); | 2085 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); |
2086 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, true); | 2086 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, true); |
2087 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, 0.0); | 2087 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, 0.0); |
2088 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1); | 2088 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1); |
2089 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); | 2089 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); |
2090 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement); | 2090 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement); |
2091 // We need to register the type of this preference in order to query | 2091 // We need to register the type of these preferences in order to query |
2092 // it even though it's only typically controlled via policy. | 2092 // them even though they's typically only controlled via policy or command |
| 2093 // line switches. |
2093 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false); | 2094 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false); |
| 2095 prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true); |
| 2096 prefs->RegisterBooleanPref(prefs::kEnableReferrers, true); |
2094 } | 2097 } |
2095 | 2098 |
2096 // static | 2099 // static |
2097 bool Browser::RunUnloadEventsHelper(TabContents* contents) { | 2100 bool Browser::RunUnloadEventsHelper(TabContents* contents) { |
2098 // If the TabContents is not connected yet, then there's no unload | 2101 // If the TabContents is not connected yet, then there's no unload |
2099 // handler we can fire even if the TabContents has an unload listener. | 2102 // handler we can fire even if the TabContents has an unload listener. |
2100 // One case where we hit this is in a tab that has an infinite loop | 2103 // One case where we hit this is in a tab that has an infinite loop |
2101 // before load. | 2104 // before load. |
2102 if (contents->NeedToFireBeforeUnload()) { | 2105 if (contents->NeedToFireBeforeUnload()) { |
2103 // If the page has unload listeners, then we tell the renderer to fire | 2106 // If the page has unload listeners, then we tell the renderer to fire |
(...skipping 2327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4431 // The page transition below is only for the purpose of inserting the tab. | 4434 // The page transition below is only for the purpose of inserting the tab. |
4432 browser->AddTab(view_source_contents, PageTransition::LINK); | 4435 browser->AddTab(view_source_contents, PageTransition::LINK); |
4433 } | 4436 } |
4434 | 4437 |
4435 if (profile_->HasSessionService()) { | 4438 if (profile_->HasSessionService()) { |
4436 SessionService* session_service = profile_->GetSessionService(); | 4439 SessionService* session_service = profile_->GetSessionService(); |
4437 if (session_service) | 4440 if (session_service) |
4438 session_service->TabRestored(&view_source_contents->controller(), false); | 4441 session_service->TabRestored(&view_source_contents->controller(), false); |
4439 } | 4442 } |
4440 } | 4443 } |
OLD | NEW |