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

Side by Side Diff: chrome/browser/extensions/extension_service.h

Issue 10702017: Revert r 144574 "Modify experimental identity flow to display scope descriptions and details." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 346
347 // Disables the extension. If the extension is already disabled, or 347 // Disables the extension. If the extension is already disabled, or
348 // cannot be disabled, does nothing. 348 // cannot be disabled, does nothing.
349 virtual void DisableExtension(const std::string& extension_id, 349 virtual void DisableExtension(const std::string& extension_id,
350 extensions::Extension::DisableReason disable_reason); 350 extensions::Extension::DisableReason disable_reason);
351 351
352 // Updates the |extension|'s granted permissions lists to include all 352 // Updates the |extension|'s granted permissions lists to include all
353 // permissions in the |extension|'s manifest and re-enables the 353 // permissions in the |extension|'s manifest and re-enables the
354 // extension. 354 // extension.
355 void GrantPermissionsAndEnableExtension( 355 void GrantPermissionsAndEnableExtension(
356 const extensions::Extension* extension, 356 const extensions::Extension* extension);
357 bool record_oauth2_grant);
358 357
359 // Check for updates (or potentially new extensions from external providers) 358 // Check for updates (or potentially new extensions from external providers)
360 void CheckForExternalUpdates(); 359 void CheckForExternalUpdates();
361 360
362 // Unload the specified extension. 361 // Unload the specified extension.
363 virtual void UnloadExtension( 362 virtual void UnloadExtension(
364 const std::string& extension_id, 363 const std::string& extension_id,
365 extension_misc::UnloadedExtensionReason reason) OVERRIDE; 364 extension_misc::UnloadedExtensionReason reason) OVERRIDE;
366 365
367 // Unload all extensions. This is currently only called on shutdown, and 366 // Unload all extensions. This is currently only called on shutdown, and
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 scoped_ptr<ExtensionGlobalError> extension_global_error_; 852 scoped_ptr<ExtensionGlobalError> extension_global_error_;
854 853
855 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 854 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
856 InstallAppsWithUnlimtedStorage); 855 InstallAppsWithUnlimtedStorage);
857 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, 856 FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
858 InstallAppsAndCheckStorageProtection); 857 InstallAppsAndCheckStorageProtection);
859 DISALLOW_COPY_AND_ASSIGN(ExtensionService); 858 DISALLOW_COPY_AND_ASSIGN(ExtensionService);
860 }; 859 };
861 860
862 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_ 861 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698