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

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

Issue 239993009: Revert accidental dartium code push (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/common/shell_content_client.h" 5 #include "content/shell/common/shell_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "content/public/common/user_agent.h" 11 #include "content/public/common/user_agent.h"
12 #include "content/shell/common/shell_switches.h" 12 #include "content/shell/common/shell_switches.h"
13 #include "grit/shell_resources.h" 13 #include "grit/shell_resources.h"
14 #include "grit/webkit_resources.h" 14 #include "grit/webkit_resources.h"
15 #include "grit/webkit_strings.h" 15 #include "grit/webkit_strings.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 18
19 namespace content { 19 namespace content {
20 20
21 ShellContentClient::~ShellContentClient() { 21 ShellContentClient::~ShellContentClient() {
22 } 22 }
23 23
24 std::string ShellContentClient::GetUserAgent() const { 24 std::string ShellContentClient::GetUserAgent() const {
25 std::string product = "Chrome/" CONTENT_SHELL_VERSION; 25 std::string product = "Chrome/" CONTENT_SHELL_VERSION;
26 product += " (Dart)";
27 CommandLine* command_line = CommandLine::ForCurrentProcess(); 26 CommandLine* command_line = CommandLine::ForCurrentProcess();
28 if (command_line->HasSwitch(switches::kUseMobileUserAgent)) 27 if (command_line->HasSwitch(switches::kUseMobileUserAgent))
29 product += " Mobile"; 28 product += " Mobile";
30 return BuildUserAgentFromProduct(product); 29 return BuildUserAgentFromProduct(product);
31 } 30 }
32 31
33 base::string16 ShellContentClient::GetLocalizedString(int message_id) const { 32 base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
34 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { 33 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
35 switch (message_id) { 34 switch (message_id) {
36 case IDS_FORM_OTHER_DATE_LABEL: 35 case IDS_FORM_OTHER_DATE_LABEL:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes( 78 base::RefCountedStaticMemory* ShellContentClient::GetDataResourceBytes(
80 int resource_id) const { 79 int resource_id) const {
81 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id); 80 return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
82 } 81 }
83 82
84 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { 83 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
85 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); 84 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
86 } 85 }
87 86
88 } // namespace content 87 } // namespace content
OLDNEW
« no previous file with comments | « content/child/simple_webmimeregistry_impl.cc ('k') | content/worker/worker_webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698