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

Unified Diff: extensions/browser/extension_function_dispatcher.cc

Issue 646983008: Implement signin using webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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: extensions/browser/extension_function_dispatcher.cc
diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
index b4924b21fca6994cbf367a2ec6bd1c8d6638d188..ae009821c9cba7badc62373d65f24deb0b365263 100644
--- a/extensions/browser/extension_function_dispatcher.cc
+++ b/extensions/browser/extension_function_dispatcher.cc
@@ -11,6 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/metrics/sparse_histogram.h"
#include "base/process/process.h"
+#include "base/strings/string_util.h"
#include "base/values.h"
#include "build/build_config.h"
#include "content/public/browser/browser_thread.h"
@@ -231,8 +232,8 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
const ExtensionHostMsg_Request_Params& params) {
const Extension* extension =
extension_info_map->extensions().GetByID(params.extension_id);
- if (!extension)
- return;
+ const std::string& extension_id = extension ?
Fady Samuel 2014/10/21 21:32:57 I'd prefer if these changes were in a separate CL.
guohui 2014/10/22 15:35:33 Done.
+ extension->id() : base::EmptyString();
ExtensionFunction::ResponseCallback callback(
base::Bind(&IOThreadResponseCallback, ipc_sender, routing_id,
@@ -258,19 +259,17 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
function_io->set_ipc_sender(ipc_sender, routing_id);
function_io->set_extension_info_map(extension_info_map);
function->set_include_incognito(
- extension_info_map->IsIncognitoEnabled(extension->id()));
+ extension_info_map->IsIncognitoEnabled(extension_id));
if (!CheckPermissions(function.get(), params, callback))
return;
QuotaService* quota = extension_info_map->GetQuotaService();
- std::string violation_error = quota->Assess(extension->id(),
- function.get(),
- &params.arguments,
- base::TimeTicks::Now());
+ std::string violation_error = quota->Assess(
+ extension_id, function.get(), &params.arguments, base::TimeTicks::Now());
if (violation_error.empty()) {
scoped_ptr<base::ListValue> args(params.arguments.DeepCopy());
- NotifyApiFunctionCalled(extension->id(),
+ NotifyApiFunctionCalled(extension_id,
params.name,
args.Pass(),
static_cast<content::BrowserContext*>(profile_id));
« extensions/browser/extension_function.h ('K') | « extensions/browser/extension_function.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698