OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/extensions/extension_tabs_module.h" | 5 #include "chrome/browser/extensions/extension_tabs_module.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1083 | 1083 |
1084 if (error_message) | 1084 if (error_message) |
1085 *error_message = ExtensionErrorUtils::FormatErrorMessage( | 1085 *error_message = ExtensionErrorUtils::FormatErrorMessage( |
1086 keys::kTabNotFoundError, base::IntToString(tab_id)); | 1086 keys::kTabNotFoundError, base::IntToString(tab_id)); |
1087 | 1087 |
1088 return false; | 1088 return false; |
1089 } | 1089 } |
1090 | 1090 |
1091 static std::string GetWindowTypeText(Browser::Type type) { | 1091 static std::string GetWindowTypeText(Browser::Type type) { |
1092 // Note: for app popups, we report "app". | 1092 // Note: for app popups, we report "app". |
1093 if ((type & Browser::TYPE_APP) != 0 || type == Browser::TYPE_EXTENSION_APP) | 1093 if ((type & Browser::TYPE_APP) != 0) |
1094 return keys::kWindowTypeValueApp; | 1094 return keys::kWindowTypeValueApp; |
1095 if ((type & Browser::TYPE_POPUP) != 0) | 1095 if ((type & Browser::TYPE_POPUP) != 0) |
1096 return keys::kWindowTypeValuePopup; | 1096 return keys::kWindowTypeValuePopup; |
1097 | 1097 |
1098 DCHECK(type == Browser::TYPE_NORMAL); | 1098 DCHECK(type == Browser::TYPE_NORMAL); |
1099 return keys::kWindowTypeValueNormal; | 1099 return keys::kWindowTypeValueNormal; |
1100 } | 1100 } |
1101 | 1101 |
1102 static GURL ResolvePossiblyRelativeURL(std::string url_string, | 1102 static GURL ResolvePossiblyRelativeURL(std::string url_string, |
1103 Extension* extension) { | 1103 Extension* extension) { |
1104 GURL url = GURL(url_string); | 1104 GURL url = GURL(url_string); |
1105 if (!url.is_valid()) | 1105 if (!url.is_valid()) |
1106 url = extension->GetResourceURL(url_string); | 1106 url = extension->GetResourceURL(url_string); |
1107 | 1107 |
1108 return url; | 1108 return url; |
1109 } | 1109 } |
OLD | NEW |