| 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 2021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2032 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 2032 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
| 2033 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 2033 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
| 2034 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 2034 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
| 2035 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 2035 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
| 2036 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2036 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
| 2037 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2037 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
| 2038 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2038 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
| 2039 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2039 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
| 2040 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); | 2040 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); |
| 2041 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); | 2041 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); |
| 2042 // We need to register the type of this preference in order to query |
| 2043 // it even though it's only typically controlled via policy. |
| 2044 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false); |
| 2042 } | 2045 } |
| 2043 | 2046 |
| 2044 // static | 2047 // static |
| 2045 bool Browser::RunUnloadEventsHelper(TabContents* contents) { | 2048 bool Browser::RunUnloadEventsHelper(TabContents* contents) { |
| 2046 // If the TabContents is not connected yet, then there's no unload | 2049 // If the TabContents is not connected yet, then there's no unload |
| 2047 // handler we can fire even if the TabContents has an unload listener. | 2050 // handler we can fire even if the TabContents has an unload listener. |
| 2048 // One case where we hit this is in a tab that has an infinite loop | 2051 // One case where we hit this is in a tab that has an infinite loop |
| 2049 // before load. | 2052 // before load. |
| 2050 if (contents->NeedToFireBeforeUnload()) { | 2053 if (contents->NeedToFireBeforeUnload()) { |
| 2051 // If the page has unload listeners, then we tell the renderer to fire | 2054 // If the page has unload listeners, then we tell the renderer to fire |
| (...skipping 2104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4156 return false; | 4159 return false; |
| 4157 } | 4160 } |
| 4158 | 4161 |
| 4159 void Browser::CreateInstantIfNecessary() { | 4162 void Browser::CreateInstantIfNecessary() { |
| 4160 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4163 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
| 4161 !profile()->IsOffTheRecord()) { | 4164 !profile()->IsOffTheRecord()) { |
| 4162 instant_.reset(new InstantController(profile_, this)); | 4165 instant_.reset(new InstantController(profile_, this)); |
| 4163 instant_unload_handler_.reset(new InstantUnloadHandler(this)); | 4166 instant_unload_handler_.reset(new InstantUnloadHandler(this)); |
| 4164 } | 4167 } |
| 4165 } | 4168 } |
| OLD | NEW |