| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer/extensions/schema_generated_bindings.h" | 5 #include "chrome/renderer/extensions/schema_generated_bindings.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 } else if (view_type_string == chrome::kViewTypeInfobar) { | 269 } else if (view_type_string == chrome::kViewTypeInfobar) { |
| 270 view_type = chrome::VIEW_TYPE_EXTENSION_INFOBAR; | 270 view_type = chrome::VIEW_TYPE_EXTENSION_INFOBAR; |
| 271 } else if (view_type_string == chrome::kViewTypeNotification) { | 271 } else if (view_type_string == chrome::kViewTypeNotification) { |
| 272 view_type = chrome::VIEW_TYPE_NOTIFICATION; | 272 view_type = chrome::VIEW_TYPE_NOTIFICATION; |
| 273 } else if (view_type_string == chrome::kViewTypeTabContents) { | 273 } else if (view_type_string == chrome::kViewTypeTabContents) { |
| 274 view_type = content::VIEW_TYPE_TAB_CONTENTS; | 274 view_type = content::VIEW_TYPE_TAB_CONTENTS; |
| 275 } else if (view_type_string == chrome::kViewTypePopup) { | 275 } else if (view_type_string == chrome::kViewTypePopup) { |
| 276 view_type = chrome::VIEW_TYPE_EXTENSION_POPUP; | 276 view_type = chrome::VIEW_TYPE_EXTENSION_POPUP; |
| 277 } else if (view_type_string == chrome::kViewTypeExtensionDialog) { | 277 } else if (view_type_string == chrome::kViewTypeExtensionDialog) { |
| 278 view_type = chrome::VIEW_TYPE_EXTENSION_DIALOG; | 278 view_type = chrome::VIEW_TYPE_EXTENSION_DIALOG; |
| 279 } else if (view_type_string == chrome::kViewTypeAppShell) { |
| 280 view_type = chrome::VIEW_TYPE_APP_SHELL; |
| 279 } else if (view_type_string != chrome::kViewTypeAll) { | 281 } else if (view_type_string != chrome::kViewTypeAll) { |
| 280 return v8::Undefined(); | 282 return v8::Undefined(); |
| 281 } | 283 } |
| 282 | 284 |
| 283 ExtensionImpl* v8_extension = GetFromArguments<ExtensionImpl>(args); | 285 ExtensionImpl* v8_extension = GetFromArguments<ExtensionImpl>(args); |
| 284 const ::Extension* extension = | 286 const ::Extension* extension = |
| 285 v8_extension->GetExtensionForCurrentRenderView(); | 287 v8_extension->GetExtensionForCurrentRenderView(); |
| 286 if (!extension) | 288 if (!extension) |
| 287 return v8::Undefined(); | 289 return v8::Undefined(); |
| 288 | 290 |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 const std::string& extension_id) { | 720 const std::string& extension_id) { |
| 719 for (PendingRequestMap::const_iterator it = g_pending_requests.Get().begin(); | 721 for (PendingRequestMap::const_iterator it = g_pending_requests.Get().begin(); |
| 720 it != g_pending_requests.Get().end(); ++it) { | 722 it != g_pending_requests.Get().end(); ++it) { |
| 721 if (it->second->extension_id == extension_id) | 723 if (it->second->extension_id == extension_id) |
| 722 return true; | 724 return true; |
| 723 } | 725 } |
| 724 return false; | 726 return false; |
| 725 } | 727 } |
| 726 | 728 |
| 727 } // namespace | 729 } // namespace |
| OLD | NEW |