| OLD | NEW |
| 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 #include "chrome/browser/automation/automation_provider_json.h" | 5 #include "chrome/browser/automation/automation_provider_json.h" |
| 6 | 6 |
| 7 #include "base/json/json_writer.h" | 7 #include "base/json/json_writer.h" |
| 8 #include "base/json/string_escape.h" | 8 #include "base/json/string_escape.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/autocomplete/autocomplete_match.h" | 10 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 11 #include "chrome/browser/automation/automation_provider.h" | 11 #include "chrome/browser/automation/automation_provider.h" |
| 12 #include "chrome/browser/automation/automation_util.h" | 12 #include "chrome/browser/automation/automation_util.h" |
| 13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/extension_system.h" | 14 #include "chrome/browser/extensions/extension_system.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/common/automation_messages.h" | 16 #include "chrome/common/automation_messages.h" |
| 17 #include "chrome/common/extensions/extension.h" | |
| 18 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
| 18 #include "extensions/common/extension.h" |
| 19 | 19 |
| 20 using content::WebContents; | 20 using content::WebContents; |
| 21 | 21 |
| 22 AutomationJSONReply::AutomationJSONReply(AutomationProvider* provider, | 22 AutomationJSONReply::AutomationJSONReply(AutomationProvider* provider, |
| 23 IPC::Message* reply_message) | 23 IPC::Message* reply_message) |
| 24 : provider_(provider), | 24 : provider_(provider), |
| 25 message_(reply_message) { | 25 message_(reply_message) { |
| 26 } | 26 } |
| 27 | 27 |
| 28 AutomationJSONReply::~AutomationJSONReply() { | 28 AutomationJSONReply::~AutomationJSONReply() { |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 | 163 |
| 164 bool GetEnabledExtensionFromJSONArgs( | 164 bool GetEnabledExtensionFromJSONArgs( |
| 165 base::DictionaryValue* args, | 165 base::DictionaryValue* args, |
| 166 const std::string& key, | 166 const std::string& key, |
| 167 Profile* profile, | 167 Profile* profile, |
| 168 const extensions::Extension** extension, | 168 const extensions::Extension** extension, |
| 169 std::string* error) { | 169 std::string* error) { |
| 170 return GetExtensionFromJSONArgsHelper( | 170 return GetExtensionFromJSONArgsHelper( |
| 171 args, key, profile, false /* include_disabled */, extension, error); | 171 args, key, profile, false /* include_disabled */, extension, error); |
| 172 } | 172 } |
| OLD | NEW |