diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
| commit | 176aa48371da91eb98d675d87b4e70c7b26d696f (patch) | |
| tree | 4c972de6ecd5a54650ab1dc7d421187f5d25834f /chrome/browser/printing | |
| parent | 9a3f0ac2899139ace97e399015259d028b4d5704 (diff) | |
| download | chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.zip chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.gz chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.bz2 | |
Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.
Move Process and SharedMemory into the base namespace (most changes).
Review URL: http://codereview.chromium.org/10895
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/print_view_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/printing/printing_layout_uitest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 8df4862..26ae627 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -131,7 +131,7 @@ void PrintViewManager::DidPrintPage( return; } - SharedMemory shared_buf(params.emf_data_handle, true); + base::SharedMemory shared_buf(params.emf_data_handle, true); if (!shared_buf.Map(params.data_size)) { NOTREACHED() << "couldn't map"; owner_.Stop(); diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc index fb0bf6b5..e8ac2e2 100644 --- a/chrome/browser/printing/printing_layout_uitest.cc +++ b/chrome/browser/printing/printing_layout_uitest.cc @@ -567,7 +567,7 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) { scoped_ptr<base::Thread> worker( new base::Thread("PrintingLayoutTest_worker")); scoped_refptr<DismissTheWindow> dismiss_task = - new DismissTheWindow(process_util::GetProcId(process())); + new DismissTheWindow(base::GetProcId(process())); // We need to start the thread to be able to set the timer. worker->Start(); worker->message_loop()->PostTask(FROM_HERE, @@ -605,7 +605,7 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) { scoped_ptr<base::Thread> worker( new base::Thread("PrintingLayoutTest_worker")); scoped_refptr<DismissTheWindow> dismiss_task = - new DismissTheWindow(process_util::GetProcId(process())); + new DismissTheWindow(base::GetProcId(process())); // We need to start the thread to be able to set the timer. worker->Start(); worker->message_loop()->PostTask(FROM_HERE, |