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

Side by Side Diff: content/shell/shell_content_client.cc

Issue 10825085: Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by c… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/shell/shell_content_client.h" 5 #include "content/shell/shell_content_client.h"
6 6
7 #include "base/string_piece.h" 7 #include "base/string_piece.h"
8 #include "ui/base/l10n/l10n_util.h"
8 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
9 #include "webkit/glue/user_agent.h" 10 #include "webkit/glue/user_agent.h"
10 11
11 namespace content { 12 namespace content {
12 13
13 ShellContentClient::~ShellContentClient() { 14 ShellContentClient::~ShellContentClient() {
14 } 15 }
15 16
16 std::string ShellContentClient::GetUserAgent() const { 17 std::string ShellContentClient::GetUserAgent() const {
17 // The "19" is so that sites that sniff for version think that this is 18 // The "19" is so that sites that sniff for version think that this is
18 // something reasonably current; the "77.34.5" is a hint that this isn't a 19 // something reasonably current; the "77.34.5" is a hint that this isn't a
19 // standard Chrome. 20 // standard Chrome.
20 return webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5"); 21 return webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5");
21 } 22 }
22 23
24 string16 ShellContentClient::GetLocalizedString(int message_id) const {
25 return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
26 }
27
23 base::StringPiece ShellContentClient::GetDataResource( 28 base::StringPiece ShellContentClient::GetDataResource(
24 int resource_id, 29 int resource_id,
25 ui::ScaleFactor scale_factor) const { 30 ui::ScaleFactor scale_factor) const {
26 return ResourceBundle::GetSharedInstance().GetRawDataResource( 31 return ResourceBundle::GetSharedInstance().GetRawDataResource(
27 resource_id, scale_factor); 32 resource_id, scale_factor);
28 } 33 }
29 34
30 } // namespace content 35 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698