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

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

Issue 131783012: Fix the handling of user gestures for external protocol handler dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary DCHECK Created 6 years, 8 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 pref_service->SetString(pref_names::kLastChromeVersion, 176 pref_service->SetString(pref_names::kLastChromeVersion,
177 current_version); 177 current_version);
178 178
179 // If there was no version string in prefs, assume we're out of date. 179 // If there was no version string in prefs, assume we're out of date.
180 if (!last_version.IsValid()) 180 if (!last_version.IsValid())
181 return true; 181 return true;
182 182
183 return last_version.IsOlderThan(current_version); 183 return last_version.IsOlderThan(current_version);
184 } 184 }
185 185
186 void ChromeExtensionsBrowserClient::PermitExternalProtocolHandler() {
187 ExternalProtocolHandler::PermitLaunchUrl();
188 }
189
190 scoped_ptr<AppSorting> ChromeExtensionsBrowserClient::CreateAppSorting() { 186 scoped_ptr<AppSorting> ChromeExtensionsBrowserClient::CreateAppSorting() {
191 return scoped_ptr<AppSorting>(new ChromeAppSorting()); 187 return scoped_ptr<AppSorting>(new ChromeAppSorting());
192 } 188 }
193 189
194 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() { 190 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() {
195 return chrome::IsRunningInForcedAppMode(); 191 return chrome::IsRunningInForcedAppMode();
196 } 192 }
197 193
198 ApiActivityMonitor* ChromeExtensionsBrowserClient::GetApiActivityMonitor( 194 ApiActivityMonitor* ChromeExtensionsBrowserClient::GetApiActivityMonitor(
199 content::BrowserContext* context) { 195 content::BrowserContext* context) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // Generated APIs from lower-level modules. 228 // Generated APIs from lower-level modules.
233 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry); 229 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry);
234 apps::api::GeneratedFunctionRegistry::RegisterAll(registry); 230 apps::api::GeneratedFunctionRegistry::RegisterAll(registry);
235 231
236 // Generated APIs from Chrome. 232 // Generated APIs from Chrome.
237 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); 233 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
238 #endif 234 #endif
239 } 235 }
240 236
241 } // namespace extensions 237 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698