diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 22:47:05 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 22:47:05 +0000 |
| commit | 745adaf46dbebab2e661a80171c2e3f00f781c97 (patch) | |
| tree | 3213a89c7646c5cb291e04da452d2fda7498a50d /chrome/browser/browser_init.cc | |
| parent | 8702a2a5130a4de75f42a472acd5ac3b0bb236a4 (diff) | |
| download | chromium_src-745adaf46dbebab2e661a80171c2e3f00f781c97.zip chromium_src-745adaf46dbebab2e661a80171c2e3f00f781c97.tar.gz chromium_src-745adaf46dbebab2e661a80171c2e3f00f781c97.tar.bz2 | |
No longer display EULA when internal Flash enabled (revert r42783 and most of r42674).
BUG=none
TEST=Run (branded, official) Google Chrome build with --enable-internal-flash; EULA "dialog" tab should no longer be shown, and our Flash should be enabled (check about:plugins). Without --enable-internal-flash, it should still not appear in about:plugins.
Review URL: http://codereview.chromium.org/1527023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index a18558f..e4c3438 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -488,22 +488,6 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, std::vector<GURL> urls_to_open = GetURLsFromCommandLine(profile_); RecordLaunchModeHistogram(urls_to_open.empty()? LM_TO_BE_DECIDED : LM_WITH_URLS); - // TODO(viettrungluu): Temporary: Display a EULA before allowing the user to - // actually enable Flash, unless they've already accepted it. Process this - // in the same way as command-line URLs. - FilePath flash_path; - if (command_line_.HasSwitch(switches::kEnableInternalFlash) && - PathService::Get(chrome::FILE_FLASH_PLUGIN, &flash_path)) { - PrefService* prefs = profile->GetPrefs(); - // Check whether the EULA has previously been accepted, defaulting to - // "no". If it hasn't, display a page which links to the EULA, etc. (This - // pref is registered by the plugin service.) - if (!prefs->GetBoolean(prefs::kPluginsFlashAuthorized)) { - urls_to_open.push_back( - GURL(chrome::kChromeUIEulaAuthorizeFlashURL)); - } - } - ProcessLaunchURLs(process_startup, urls_to_open); // If this is an app launch, but we didn't open an app window, it may |