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/common/extensions/extension_localization_peer.h" | 5 #include "chrome/common/extensions/extension_localization_peer.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "chrome/common/extensions/extension_message_bundle.h" | |
10 #include "chrome/common/extensions/extension_messages.h" | 9 #include "chrome/common/extensions/extension_messages.h" |
| 10 #include "chrome/common/extensions/message_bundle.h" |
11 #include "chrome/common/url_constants.h" | 11 #include "chrome/common/url_constants.h" |
12 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
13 #include "net/base/net_errors.h" | 13 #include "net/base/net_errors.h" |
14 #include "net/http/http_response_headers.h" | 14 #include "net/http/http_response_headers.h" |
15 #include "webkit/glue/webkit_glue.h" | 15 #include "webkit/glue/webkit_glue.h" |
16 | 16 |
17 ExtensionLocalizationPeer::ExtensionLocalizationPeer( | 17 ExtensionLocalizationPeer::ExtensionLocalizationPeer( |
18 webkit_glue::ResourceLoaderBridge::Peer* peer, | 18 webkit_glue::ResourceLoaderBridge::Peer* peer, |
19 IPC::Sender* message_sender, | 19 IPC::Sender* message_sender, |
20 const GURL& request_url) | 20 const GURL& request_url) |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 } | 93 } |
94 | 94 |
95 void ExtensionLocalizationPeer::ReplaceMessages() { | 95 void ExtensionLocalizationPeer::ReplaceMessages() { |
96 if (!message_sender_ || data_.empty()) | 96 if (!message_sender_ || data_.empty()) |
97 return; | 97 return; |
98 | 98 |
99 if (!request_url_.is_valid()) | 99 if (!request_url_.is_valid()) |
100 return; | 100 return; |
101 | 101 |
102 std::string extension_id = request_url_.host(); | 102 std::string extension_id = request_url_.host(); |
103 L10nMessagesMap* l10n_messages = GetL10nMessagesMap(extension_id); | 103 extensions::L10nMessagesMap* l10n_messages = |
| 104 extensions::GetL10nMessagesMap(extension_id); |
104 if (!l10n_messages) { | 105 if (!l10n_messages) { |
105 L10nMessagesMap messages; | 106 extensions::L10nMessagesMap messages; |
106 message_sender_->Send(new ExtensionHostMsg_GetMessageBundle( | 107 message_sender_->Send(new ExtensionHostMsg_GetMessageBundle( |
107 extension_id, &messages)); | 108 extension_id, &messages)); |
108 | 109 |
109 // Save messages we got, so we don't have to ask again. | 110 // Save messages we got, so we don't have to ask again. |
110 // Messages map is never empty, it contains at least @@extension_id value. | 111 // Messages map is never empty, it contains at least @@extension_id value. |
111 ExtensionToL10nMessagesMap& l10n_messages_map = | 112 extensions::ExtensionToL10nMessagesMap& l10n_messages_map = |
112 *GetExtensionToL10nMessagesMap(); | 113 *extensions::GetExtensionToL10nMessagesMap(); |
113 l10n_messages_map[extension_id] = messages; | 114 l10n_messages_map[extension_id] = messages; |
114 | 115 |
115 l10n_messages = GetL10nMessagesMap(extension_id); | 116 l10n_messages = extensions::GetL10nMessagesMap(extension_id); |
116 } | 117 } |
117 | 118 |
118 std::string error; | 119 std::string error; |
119 if (ExtensionMessageBundle::ReplaceMessagesWithExternalDictionary( | 120 if (extensions::MessageBundle::ReplaceMessagesWithExternalDictionary( |
120 *l10n_messages, &data_, &error)) { | 121 *l10n_messages, &data_, &error)) { |
121 data_.resize(data_.size()); | 122 data_.resize(data_.size()); |
122 } | 123 } |
123 } | 124 } |
OLD | NEW |