mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update for move of string symbols into base::

Browse source
This commit is contained in:
Adam Roben 2014-06-26 16:29:38 -04:00
parent 5b93dc74e6
commit 5b788476a5
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -117,7 +117,7 @@ void InspectableWebContentsImpl::UpdateFrontendDockSide() {
auto javascript = base::StringPrintf( auto javascript = base::StringPrintf(
"InspectorFrontendAPI.setDockSide(\"%s\")", dock_side_.c_str()); "InspectorFrontendAPI.setDockSide(\"%s\")", dock_side_.c_str());
devtools_web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame( devtools_web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
string16(), ASCIIToUTF16(javascript)); base::string16(), base::ASCIIToUTF16(javascript));
} }
void InspectableWebContentsImpl::ActivateWindow() { void InspectableWebContentsImpl::ActivateWindow() {

2
brightray/browser/network_delegate.cc
View file

@ -59,7 +59,7 @@ void NetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
} }
void NetworkDelegate::OnPACScriptError(int line_number, void NetworkDelegate::OnPACScriptError(int line_number,
const string16& error) { const base::string16& error) {
} }
NetworkDelegate::AuthRequiredResponse NetworkDelegate::OnAuthRequired( NetworkDelegate::AuthRequiredResponse NetworkDelegate::OnAuthRequired(

2
brightray/browser/network_delegate.h
View file

@ -37,7 +37,7 @@ class NetworkDelegate : public net::NetworkDelegate {
virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE; virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE; virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
virtual void OnPACScriptError(int line_number, virtual void OnPACScriptError(int line_number,
const string16& error) OVERRIDE; const base::string16& error) OVERRIDE;
virtual AuthRequiredResponse OnAuthRequired( virtual AuthRequiredResponse OnAuthRequired(
net::URLRequest* request, net::URLRequest* request,
const net::AuthChallengeInfo& auth_info, const net::AuthChallengeInfo& auth_info,

2
brightray/browser/url_request_context_getter.cc
View file

@ -85,7 +85,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
base::WorkerPool::GetTaskRunner(true))); base::WorkerPool::GetTaskRunner(true)));
storage_->set_http_user_agent_settings( storage_->set_http_user_agent_settings(
new net::StaticHttpUserAgentSettings( new net::StaticHttpUserAgentSettings(
"en-us,en", EmptyString())); "en-us,en", base::EmptyString()));
scoped_ptr<net::HostResolver> host_resolver( scoped_ptr<net::HostResolver> host_resolver(
net::HostResolver::CreateDefaultResolver(NULL)); net::HostResolver::CreateDefaultResolver(NULL));

2
brightray/common/content_client.cc
View file

@ -21,7 +21,7 @@ ContentClient::~ContentClient() {
std::string ContentClient::GetProduct() const { std::string ContentClient::GetProduct() const {
auto name = GetApplicationName(); auto name = GetApplicationName();
RemoveChars(name, kWhitespaceASCII, &name); base::RemoveChars(name, base::kWhitespaceASCII, &name);
return base::StringPrintf("%s/%s", return base::StringPrintf("%s/%s",
name.c_str(), GetApplicationVersion().c_str()); name.c_str(), GetApplicationVersion().c_str());
} }