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

Side by Side Diff: chrome/browser/browser_about_handler.cc

Issue 8402016: set user agent for content browser tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | 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) 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/browser/browser_about_handler.h" 5 #include "chrome/browser/browser_about_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/common/net/gaia/google_service_auth_error.h" 46 #include "chrome/common/net/gaia/google_service_auth_error.h"
47 #include "chrome/common/render_messages.h" 47 #include "chrome/common/render_messages.h"
48 #include "chrome/common/url_constants.h" 48 #include "chrome/common/url_constants.h"
49 #include "content/browser/gpu/gpu_process_host.h" 49 #include "content/browser/gpu/gpu_process_host.h"
50 #include "content/browser/plugin_service.h" 50 #include "content/browser/plugin_service.h"
51 #include "content/browser/renderer_host/render_process_host.h" 51 #include "content/browser/renderer_host/render_process_host.h"
52 #include "content/browser/renderer_host/render_view_host.h" 52 #include "content/browser/renderer_host/render_view_host.h"
53 #include "content/browser/sensors/sensors_provider.h" 53 #include "content/browser/sensors/sensors_provider.h"
54 #include "content/common/gpu/gpu_messages.h" 54 #include "content/common/gpu/gpu_messages.h"
55 #include "content/public/browser/browser_thread.h" 55 #include "content/public/browser/browser_thread.h"
56 #include "content/public/common/content_client.h"
56 #include "crypto/nss_util.h" 57 #include "crypto/nss_util.h"
57 #include "googleurl/src/gurl.h" 58 #include "googleurl/src/gurl.h"
58 #include "grit/browser_resources.h" 59 #include "grit/browser_resources.h"
59 #include "grit/chromium_strings.h" 60 #include "grit/chromium_strings.h"
60 #include "grit/generated_resources.h" 61 #include "grit/generated_resources.h"
61 #include "grit/locale_settings.h" 62 #include "grit/locale_settings.h"
62 #include "net/base/escape.h" 63 #include "net/base/escape.h"
63 #include "net/base/net_util.h" 64 #include "net/base/net_util.h"
64 #include "ui/base/l10n/l10n_util.h" 65 #include "ui/base/l10n/l10n_util.h"
65 #include "ui/base/resource/resource_bundle.h" 66 #include "ui/base/resource/resource_bundle.h"
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 localized_strings->SetString("copyright", 1191 localized_strings->SetString("copyright",
1191 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT)); 1192 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT));
1192 localized_strings->SetString("cl", version_info.LastChange()); 1193 localized_strings->SetString("cl", version_info.LastChange());
1193 localized_strings->SetString("official", 1194 localized_strings->SetString("official",
1194 l10n_util::GetStringUTF16( 1195 l10n_util::GetStringUTF16(
1195 version_info.IsOfficialBuild() ? 1196 version_info.IsOfficialBuild() ?
1196 IDS_ABOUT_VERSION_OFFICIAL 1197 IDS_ABOUT_VERSION_OFFICIAL
1197 : IDS_ABOUT_VERSION_UNOFFICIAL)); 1198 : IDS_ABOUT_VERSION_UNOFFICIAL));
1198 localized_strings->SetString("user_agent_name", 1199 localized_strings->SetString("user_agent_name",
1199 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_USER_AGENT)); 1200 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_USER_AGENT));
1200 localized_strings->SetString("useragent", webkit_glue::GetUserAgent(GURL())); 1201 localized_strings->SetString("useragent", content::GetUserAgent(GURL()));
1201 localized_strings->SetString("command_line_name", 1202 localized_strings->SetString("command_line_name",
1202 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMMAND_LINE)); 1203 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COMMAND_LINE));
1203 1204
1204 #if defined(OS_WIN) 1205 #if defined(OS_WIN)
1205 localized_strings->SetString("command_line", 1206 localized_strings->SetString("command_line",
1206 WideToUTF16(CommandLine::ForCurrentProcess()->GetCommandLineString())); 1207 WideToUTF16(CommandLine::ForCurrentProcess()->GetCommandLineString()));
1207 #elif defined(OS_POSIX) 1208 #elif defined(OS_POSIX)
1208 std::string command_line = ""; 1209 std::string command_line = "";
1209 typedef std::vector<std::string> ArgvList; 1210 typedef std::vector<std::string> ArgvList;
1210 const ArgvList& argv = CommandLine::ForCurrentProcess()->argv(); 1211 const ArgvList& argv = CommandLine::ForCurrentProcess()->argv();
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
1636 return false; 1637 return false;
1637 } 1638 }
1638 1639
1639 std::vector<std::string> ChromePaths() { 1640 std::vector<std::string> ChromePaths() {
1640 std::vector<std::string> paths; 1641 std::vector<std::string> paths;
1641 paths.reserve(arraysize(kChromePaths)); 1642 paths.reserve(arraysize(kChromePaths));
1642 for (size_t i = 0; i < arraysize(kChromePaths); i++) 1643 for (size_t i = 0; i < arraysize(kChromePaths); i++)
1643 paths.push_back(kChromePaths[i]); 1644 paths.push_back(kChromePaths[i]);
1644 return paths; 1645 return paths;
1645 } 1646 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698