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

Side by Side Diff: chrome/renderer/chrome_mock_render_thread.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/chrome_mock_render_thread.h" 5 #include "chrome/renderer/chrome_mock_render_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/renderer/printing/mock_printer.h" 10 #include "chrome/renderer/printing/mock_printer.h"
11 #include "extensions/common/extension_messages.h" 11 #include "extensions/common/extension_messages.h"
12 #include "ipc/ipc_sync_message.h" 12 #include "ipc/ipc_sync_message.h"
13 #include "printing/page_range.h" 13 #include "printing/page_range.h"
14 #include "printing/print_job_constants.h" 14 #include "printing/print_job_constants.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include <fcntl.h> 18 #include <fcntl.h>
19 19
20 #include "base/file_util.h" 20 #include "base/files/file_util.h"
21 #endif 21 #endif
22 22
23 #if defined(ENABLE_PRINTING) 23 #if defined(ENABLE_PRINTING)
24 #include "chrome/common/print_messages.h" 24 #include "chrome/common/print_messages.h"
25 #endif 25 #endif
26 26
27 ChromeMockRenderThread::ChromeMockRenderThread() 27 ChromeMockRenderThread::ChromeMockRenderThread()
28 #if defined(ENABLE_PRINTING) 28 #if defined(ENABLE_PRINTING)
29 : printer_(new MockPrinter), 29 : printer_(new MockPrinter),
30 print_dialog_user_response_(true), 30 print_dialog_user_response_(true),
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 } 219 }
220 220
221 void ChromeMockRenderThread::set_print_preview_cancel_page_number(int page) { 221 void ChromeMockRenderThread::set_print_preview_cancel_page_number(int page) {
222 print_preview_cancel_page_number_ = page; 222 print_preview_cancel_page_number_ = page;
223 } 223 }
224 224
225 int ChromeMockRenderThread::print_preview_pages_remaining() const { 225 int ChromeMockRenderThread::print_preview_pages_remaining() const {
226 return print_preview_pages_remaining_; 226 return print_preview_pages_remaining_;
227 } 227 }
228 #endif // defined(ENABLE_PRINTING) 228 #endif // defined(ENABLE_PRINTING)
OLDNEW
« no previous file with comments | « chrome/common/service_process_util_unittest.cc ('k') | chrome/renderer/chrome_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698