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

Side by Side Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 7583016: wstring: remove wstrings from ChildProcessInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « no previous file | chrome/browser/importer/profile_import_process_host.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) 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/automation/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2613 matching lines...) Expand 10 before | Expand all | Expand 10 after
2624 virtual void Run() { 2624 virtual void Run() {
2625 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2625 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2626 for (BrowserChildProcessHost::Iterator iter; !iter.Done(); ++iter) { 2626 for (BrowserChildProcessHost::Iterator iter; !iter.Done(); ++iter) {
2627 // Only add processes which are already started, 2627 // Only add processes which are already started,
2628 // since we need their handle. 2628 // since we need their handle.
2629 if ((*iter)->handle() == base::kNullProcessHandle) { 2629 if ((*iter)->handle() == base::kNullProcessHandle) {
2630 continue; 2630 continue;
2631 } 2631 }
2632 ChildProcessInfo* info = *iter; 2632 ChildProcessInfo* info = *iter;
2633 DictionaryValue* item = new DictionaryValue; 2633 DictionaryValue* item = new DictionaryValue;
2634 item->SetString("name", WideToUTF16Hack(info->name())); 2634 item->SetString("name", info->name());
2635 item->SetString("type", 2635 item->SetString("type",
2636 ChildProcessInfo::GetTypeNameInEnglish(info->type())); 2636 ChildProcessInfo::GetTypeNameInEnglish(info->type()));
2637 item->SetInteger("pid", base::GetProcId(info->handle())); 2637 item->SetInteger("pid", base::GetProcId(info->handle()));
2638 child_processes_->Append(item); 2638 child_processes_->Append(item);
2639 } 2639 }
2640 event_->Signal(); 2640 event_->Signal();
2641 } 2641 }
2642 2642
2643 private: 2643 private:
2644 base::WaitableEvent* const event_; // weak 2644 base::WaitableEvent* const event_; // weak
(...skipping 3515 matching lines...) Expand 10 before | Expand all | Expand 10 after
6160 IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl); 6160 IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
6161 6161
6162 Send(reply_message_); 6162 Send(reply_message_);
6163 redirect_query_ = 0; 6163 redirect_query_ = 0;
6164 reply_message_ = NULL; 6164 reply_message_ = NULL;
6165 } 6165 }
6166 6166
6167 void TestingAutomationProvider::OnRemoveProvider() { 6167 void TestingAutomationProvider::OnRemoveProvider() {
6168 AutomationProviderList::GetInstance()->RemoveProvider(this); 6168 AutomationProviderList::GetInstance()->RemoveProvider(this);
6169 } 6169 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/importer/profile_import_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698