Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Side by Side Diff: chrome/browser/remoting/remoting_resources_source.cc

Issue 3153029: Resubmit r56600 - Start/stop service process when browser starts and stop (Closed)
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/remoting/remoting_setup_flow.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/remoting/remoting_resources_source.h" 5 #include "chrome/browser/remoting/remoting_resources_source.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Start by setting the per-locale URLs we show on the setup wizard. 45 // Start by setting the per-locale URLs we show on the setup wizard.
46 localized_strings.SetString("invalidpasswordhelpurl", 46 localized_strings.SetString("invalidpasswordhelpurl",
47 GetLocalizedUrl(kInvalidPasswordHelpUrl)); 47 GetLocalizedUrl(kInvalidPasswordHelpUrl));
48 localized_strings.SetString("cannotaccessaccounturl", 48 localized_strings.SetString("cannotaccessaccounturl",
49 GetLocalizedUrl(kCanNotAccessAccountUrl)); 49 GetLocalizedUrl(kCanNotAccessAccountUrl));
50 localized_strings.SetString("createnewaccounturl", 50 localized_strings.SetString("createnewaccounturl",
51 GetLocalizedUrl(kCreateNewAccountUrl)); 51 GetLocalizedUrl(kCreateNewAccountUrl));
52 52
53 localized_strings.SetString("settingupsync", 53 localized_strings.SetString("settingupsync",
54 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SETTING_UP_SYNC)); 54 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SETTING_UP_SYNC));
55 localized_strings.SetString("introduction", 55 localized_strings.SetString("introduction", "");
56 ASCIIToUTF16("Remoting ") +
57 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
58 localized_strings.SetString("signinprefix", 56 localized_strings.SetString("signinprefix",
59 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SIGNIN_PREFIX)); 57 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SIGNIN_PREFIX));
60 localized_strings.SetString("signinsuffix", 58 localized_strings.SetString("signinsuffix",
61 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SIGNIN_SUFFIX)); 59 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_SIGNIN_SUFFIX));
62 localized_strings.SetString("cannotbeblank", 60 localized_strings.SetString("cannotbeblank",
63 l10n_util::GetStringUTF16(IDS_SYNC_CANNOT_BE_BLANK)); 61 l10n_util::GetStringUTF16(IDS_SYNC_CANNOT_BE_BLANK));
64 localized_strings.SetString("emaillabel", 62 localized_strings.SetString("emaillabel",
65 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_EMAIL)); 63 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_EMAIL));
66 localized_strings.SetString("passwordlabel", 64 localized_strings.SetString("passwordlabel",
67 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_PASSWORD)); 65 l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_PASSWORD));
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 SendResponse(request_id, html_bytes); 111 SendResponse(request_id, html_bytes);
114 } 112 }
115 113
116 std::string RemotingResourcesSource::GetLocalizedUrl( 114 std::string RemotingResourcesSource::GetLocalizedUrl(
117 const std::string& url) const { 115 const std::string& url) const {
118 GURL original_url(url); 116 GURL original_url(url);
119 DCHECK(original_url.is_valid()); 117 DCHECK(original_url.is_valid());
120 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url); 118 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url);
121 return localized_url.spec(); 119 return localized_url.spec();
122 } 120 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/remoting/remoting_setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698