| Index: chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc
|
| diff --git a/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc b/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc
|
| index cbf9d67054d096c2b83d0e5bff6cc9acbf1e6709..43b93fb3d23d31fc3b577ac274ca4a078de0a48f 100644
|
| --- a/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc
|
| +++ b/chrome/browser/android/blimp/chrome_blimp_client_context_delegate.cc
|
| @@ -10,6 +10,7 @@
|
| #include "blimp/client/public/blimp_client_context.h"
|
| #include "blimp/client/public/blimp_client_context_delegate.h"
|
| #include "blimp/client/public/contents/blimp_contents.h"
|
| +#include "blimp/client/public/resources/blimp_strings.h"
|
| #include "blimp/client/support/resources/blimp_strings.h"
|
| #include "chrome/browser/android/blimp/blimp_client_context_factory.h"
|
| #include "chrome/browser/android/blimp/blimp_contents_profile_attachment.h"
|
| @@ -43,13 +44,8 @@ void ChromeBlimpClientContextDelegate::OnAssignmentConnectionAttempted(
|
| const blimp::client::Assignment& assignment) {
|
| if (result == blimp::client::ASSIGNMENT_REQUEST_RESULT_OK)
|
| return;
|
| -
|
| - // TODO(xingliu): All strings shown in the UI should be accessed through grd
|
| - // files. https://crbug.com/630687
|
| - std::stringstream ss;
|
| - ss << "Assignment failed, reason: " << result << ".";
|
| - base::string16 message =
|
| - blimp::string::BlimpPrefix(base::UTF8ToUTF16(ss.str()));
|
| + base::string16 message = blimp::string::BlimpPrefix(
|
| + blimp::string::AssignmentResultErrorToString(result));
|
| ShowMessage(message, false);
|
| }
|
|
|
| @@ -76,7 +72,7 @@ void ChromeBlimpClientContextDelegate::OnConnected() {
|
| }
|
|
|
| void ChromeBlimpClientContextDelegate::OnEngineDisconnected(int result) {
|
| - OnDisconnected(base::UTF8ToUTF16(base::IntToString(result)));
|
| + OnDisconnected(blimp::string::EndConnectionMessageToString(result));
|
| }
|
|
|
| void ChromeBlimpClientContextDelegate::OnNetworkDisconnected(int result) {
|
|
|