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

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

Issue 2885017: Moved common parts of ChildProcessHost into chrome/common and created a Brows... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Code review changes Created 10 years, 5 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/browser.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/automation_provider.h" 5 #include "chrome/browser/automation/automation_provider.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/message_box_flags.h" 10 #include "app/message_box_flags.h"
(...skipping 1777 matching lines...) Expand 10 before | Expand all | Expand 10 after
1788 windows->Append(browser_item); 1788 windows->Append(browser_item);
1789 } 1789 }
1790 return_value->Set(L"windows", windows); 1790 return_value->Set(L"windows", windows);
1791 1791
1792 return_value->SetString(L"child_process_path", 1792 return_value->SetString(L"child_process_path",
1793 ChildProcessHost::GetChildPath(true).value()); 1793 ChildProcessHost::GetChildPath(true).value());
1794 // Child processes are the processes for plugins and other workers. 1794 // Child processes are the processes for plugins and other workers.
1795 // Add all child processes in a list of dictionaries, one dictionary item 1795 // Add all child processes in a list of dictionaries, one dictionary item
1796 // per child process. 1796 // per child process.
1797 ListValue* child_processes = new ListValue; 1797 ListValue* child_processes = new ListValue;
1798 for (ChildProcessHost::Iterator iter; !iter.Done(); ++iter) { 1798 for (BrowserChildProcessHost::Iterator iter; !iter.Done(); ++iter) {
1799 // Only add processes which are already started, since we need their handle. 1799 // Only add processes which are already started, since we need their handle.
1800 if ((*iter)->handle() != base::kNullProcessHandle) { 1800 if ((*iter)->handle() != base::kNullProcessHandle) {
1801 ChildProcessInfo* info = *iter; 1801 ChildProcessInfo* info = *iter;
1802 DictionaryValue* item = new DictionaryValue; 1802 DictionaryValue* item = new DictionaryValue;
1803 item->SetString(L"name", info->name()); 1803 item->SetString(L"name", info->name());
1804 item->SetString(L"type", 1804 item->SetString(L"type",
1805 ChildProcessInfo::GetTypeNameInEnglish(info->type())); 1805 ChildProcessInfo::GetTypeNameInEnglish(info->type()));
1806 item->SetInteger(L"pid", base::GetProcId(info->handle())); 1806 item->SetInteger(L"pid", base::GetProcId(info->handle()));
1807 child_processes->Append(item); 1807 child_processes->Append(item);
1808 } 1808 }
(...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after
3610 } 3610 }
3611 3611
3612 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) { 3612 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
3613 NOTIMPLEMENTED(); 3613 NOTIMPLEMENTED();
3614 } 3614 }
3615 #endif // !defined(TOOLKIT_VIEWS) 3615 #endif // !defined(TOOLKIT_VIEWS)
3616 3616
3617 void AutomationProvider::ResetToDefaultTheme() { 3617 void AutomationProvider::ResetToDefaultTheme() {
3618 profile_->ClearTheme(); 3618 profile_->ClearTheme();
3619 } 3619 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698