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

Unified Diff: chrome/browser/extensions/extension_install_prompt.cc

Issue 11882025: Move "oauth2" manifest key parsing out of Extension class. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_install_prompt.cc
===================================================================
--- chrome/browser/extensions/extension_install_prompt.cc (revision 176209)
+++ chrome/browser/extensions/extension_install_prompt.cc (working copy)
@@ -23,6 +23,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -593,9 +594,10 @@
return;
}
- const Extension::OAuth2Info& oauth2_info = extension_->oauth2_info();
- if (oauth2_info.client_id.empty() ||
- oauth2_info.scopes.empty()) {
+ const extensions::OAuth2Info* oauth2_info =
+ extensions::OAuth2Info::GetOAuth2Info(extension_);
+ if (oauth2_info->client_id.empty() ||
+ oauth2_info->scopes.empty()) {
ShowConfirmation();
return;
}
@@ -609,8 +611,8 @@
OAuth2MintTokenFlow::Parameters(
token_service->GetOAuth2LoginRefreshToken(),
extension_->id(),
- oauth2_info.client_id,
- oauth2_info.scopes,
+ oauth2_info->client_id,
+ oauth2_info->scopes,
OAuth2MintTokenFlow::MODE_ISSUE_ADVICE)));
token_flow_->Start();
}

Powered by Google App Engine
This is Rietveld 408576698