Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 6027004: Revert 69753 - Added group policy for disabling all client-side 3D APIs in Ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
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 2020 matching lines...) Expand 10 before | Expand all | Expand 10 after
2031 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); 2031 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
2032 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); 2032 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
2033 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); 2033 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
2034 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); 2034 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false);
2035 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); 2035 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true);
2036 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); 2036 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false);
2037 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); 2037 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
2038 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false); 2038 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
2039 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0); 2039 prefs->RegisterRealPref(prefs::kDefaultZoomLevel, 0.0);
2040 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); 2040 prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
2041 // We need to register the type of this preference in order to query
2042 // it even though it's only typically controlled via policy.
2043 prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
2044 } 2041 }
2045 2042
2046 // static 2043 // static
2047 bool Browser::RunUnloadEventsHelper(TabContents* contents) { 2044 bool Browser::RunUnloadEventsHelper(TabContents* contents) {
2048 // If the TabContents is not connected yet, then there's no unload 2045 // 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. 2046 // 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 2047 // One case where we hit this is in a tab that has an infinite loop
2051 // before load. 2048 // before load.
2052 if (contents->NeedToFireBeforeUnload()) { 2049 if (contents->NeedToFireBeforeUnload()) {
2053 // If the page has unload listeners, then we tell the renderer to fire 2050 // If the page has unload listeners, then we tell the renderer to fire
(...skipping 2158 matching lines...) Expand 10 before | Expand all | Expand 10 after
4212 // The page transition below is only for the purpose of inserting the tab. 4209 // The page transition below is only for the purpose of inserting the tab.
4213 browser->AddTab(contents_dupe, PageTransition::LINK); 4210 browser->AddTab(contents_dupe, PageTransition::LINK);
4214 } 4211 }
4215 4212
4216 if (profile_->HasSessionService()) { 4213 if (profile_->HasSessionService()) {
4217 SessionService* session_service = profile_->GetSessionService(); 4214 SessionService* session_service = profile_->GetSessionService();
4218 if (session_service) 4215 if (session_service)
4219 session_service->TabRestored(&new_contents->controller(), pinned); 4216 session_service->TabRestored(&new_contents->controller(), pinned);
4220 } 4217 }
4221 } 4218 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_host_delegate_helper.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698