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

Side by Side Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 436703002: Revert external protocol handler user gesture fix on M36 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src
Patch Set: Created 6 years, 4 months 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include "apps/common/api/generated_api.h" 7 #include "apps/common/api/generated_api.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/version.h" 9 #include "base/version.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 10 #include "chrome/browser/app_mode/app_mode_utils.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 pref_service->SetString(pref_names::kLastChromeVersion, 216 pref_service->SetString(pref_names::kLastChromeVersion,
217 current_version); 217 current_version);
218 218
219 // If there was no version string in prefs, assume we're out of date. 219 // If there was no version string in prefs, assume we're out of date.
220 if (!last_version.IsValid()) 220 if (!last_version.IsValid())
221 return true; 221 return true;
222 222
223 return last_version.IsOlderThan(current_version); 223 return last_version.IsOlderThan(current_version);
224 } 224 }
225 225
226 void ChromeExtensionsBrowserClient::PermitExternalProtocolHandler() {
227 ExternalProtocolHandler::PermitLaunchUrl();
228 }
229
226 scoped_ptr<AppSorting> ChromeExtensionsBrowserClient::CreateAppSorting() { 230 scoped_ptr<AppSorting> ChromeExtensionsBrowserClient::CreateAppSorting() {
227 return scoped_ptr<AppSorting>(new ChromeAppSorting()); 231 return scoped_ptr<AppSorting>(new ChromeAppSorting());
228 } 232 }
229 233
230 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() { 234 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() {
231 return chrome::IsRunningInForcedAppMode(); 235 return chrome::IsRunningInForcedAppMode();
232 } 236 }
233 237
234 ApiActivityMonitor* ChromeExtensionsBrowserClient::GetApiActivityMonitor( 238 ApiActivityMonitor* ChromeExtensionsBrowserClient::GetApiActivityMonitor(
235 content::BrowserContext* context) { 239 content::BrowserContext* context) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 } 275 }
272 276
273 scoped_ptr<extensions::RuntimeAPIDelegate> 277 scoped_ptr<extensions::RuntimeAPIDelegate>
274 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( 278 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate(
275 content::BrowserContext* context) const { 279 content::BrowserContext* context) const {
276 return scoped_ptr<extensions::RuntimeAPIDelegate>( 280 return scoped_ptr<extensions::RuntimeAPIDelegate>(
277 new ChromeRuntimeAPIDelegate(context)); 281 new ChromeRuntimeAPIDelegate(context));
278 } 282 }
279 283
280 } // namespace extensions 284 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698