| 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 2043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2054 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 2054 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
| 2055 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 2055 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
| 2056 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 2056 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
| 2057 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 2057 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
| 2058 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2058 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
| 2059 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2059 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
| 2060 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2060 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
| 2061 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2061 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
| 2062 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); | 2062 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); |
| 2063 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, true); | 2063 prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, true); |
| 2064 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); | 2064 prefs->RegisterDoublePref(prefs::kDefaultZoomLevel, 0.0); |
| 2065 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); | 2065 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); |
| 2066 // We need to register the type of this preference in order to query | 2066 // We need to register the type of this preference in order to query |
| 2067 // it even though it's only typically controlled via policy. | 2067 // it even though it's only typically controlled via policy. |
| 2068 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false); | 2068 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false); |
| 2069 } | 2069 } |
| 2070 | 2070 |
| 2071 // static | 2071 // static |
| 2072 bool Browser::RunUnloadEventsHelper(TabContents* contents) { | 2072 bool Browser::RunUnloadEventsHelper(TabContents* contents) { |
| 2073 // If the TabContents is not connected yet, then there's no unload | 2073 // If the TabContents is not connected yet, then there's no unload |
| 2074 // handler we can fire even if the TabContents has an unload listener. | 2074 // handler we can fire even if the TabContents has an unload listener. |
| (...skipping 2224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4299 // The page transition below is only for the purpose of inserting the tab. | 4299 // The page transition below is only for the purpose of inserting the tab. |
| 4300 browser->AddTab(view_source_contents, PageTransition::LINK); | 4300 browser->AddTab(view_source_contents, PageTransition::LINK); |
| 4301 } | 4301 } |
| 4302 | 4302 |
| 4303 if (profile_->HasSessionService()) { | 4303 if (profile_->HasSessionService()) { |
| 4304 SessionService* session_service = profile_->GetSessionService(); | 4304 SessionService* session_service = profile_->GetSessionService(); |
| 4305 if (session_service) | 4305 if (session_service) |
| 4306 session_service->TabRestored(&view_source_contents->controller(), false); | 4306 session_service->TabRestored(&view_source_contents->controller(), false); |
| 4307 } | 4307 } |
| 4308 } | 4308 } |
| OLD | NEW |