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

Side by Side Diff: chrome/test/base/testing_browser_process.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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
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/test/base/testing_browser_process.h" 5 #include "chrome/test/base/testing_browser_process.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/time/default_tick_clock.h" 9 #include "base/time/default_tick_clock.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 25 matching lines...) Expand all
36 #endif // defined(ENABLE_CONFIGURATION_POLICY) 36 #endif // defined(ENABLE_CONFIGURATION_POLICY)
37 37
38 #if defined(ENABLE_EXTENSIONS) 38 #if defined(ENABLE_EXTENSIONS)
39 #include "chrome/browser/extensions/chrome_extensions_browser_client.h" 39 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
40 #include "chrome/browser/media_galleries/media_file_system_registry.h" 40 #include "chrome/browser/media_galleries/media_file_system_registry.h"
41 #include "chrome/browser/ui/apps/chrome_app_window_client.h" 41 #include "chrome/browser/ui/apps/chrome_app_window_client.h"
42 #include "components/storage_monitor/storage_monitor.h" 42 #include "components/storage_monitor/storage_monitor.h"
43 #include "components/storage_monitor/test_storage_monitor.h" 43 #include "components/storage_monitor/test_storage_monitor.h"
44 #endif 44 #endif
45 45
46 #if defined(ENABLE_FULL_PRINTING) 46 #if defined(ENABLE_PRINT_PREVIEW)
47 #include "chrome/browser/printing/background_printing_manager.h" 47 #include "chrome/browser/printing/background_printing_manager.h"
48 #include "chrome/browser/printing/print_preview_dialog_controller.h" 48 #include "chrome/browser/printing/print_preview_dialog_controller.h"
49 #endif 49 #endif
50 50
51 // static 51 // static
52 TestingBrowserProcess* TestingBrowserProcess::GetGlobal() { 52 TestingBrowserProcess* TestingBrowserProcess::GetGlobal() {
53 return static_cast<TestingBrowserProcess*>(g_browser_process); 53 return static_cast<TestingBrowserProcess*>(g_browser_process);
54 } 54 }
55 55
56 // static 56 // static
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 print_job_manager_.reset(new printing::PrintJobManager()); 274 print_job_manager_.reset(new printing::PrintJobManager());
275 return print_job_manager_.get(); 275 return print_job_manager_.get();
276 #else 276 #else
277 NOTIMPLEMENTED(); 277 NOTIMPLEMENTED();
278 return NULL; 278 return NULL;
279 #endif 279 #endif
280 } 280 }
281 281
282 printing::PrintPreviewDialogController* 282 printing::PrintPreviewDialogController*
283 TestingBrowserProcess::print_preview_dialog_controller() { 283 TestingBrowserProcess::print_preview_dialog_controller() {
284 #if defined(ENABLE_FULL_PRINTING) 284 #if defined(ENABLE_PRINT_PREVIEW)
285 if (!print_preview_dialog_controller_.get()) 285 if (!print_preview_dialog_controller_.get())
286 print_preview_dialog_controller_ = 286 print_preview_dialog_controller_ =
287 new printing::PrintPreviewDialogController(); 287 new printing::PrintPreviewDialogController();
288 return print_preview_dialog_controller_.get(); 288 return print_preview_dialog_controller_.get();
289 #else 289 #else
290 NOTIMPLEMENTED(); 290 NOTIMPLEMENTED();
291 return NULL; 291 return NULL;
292 #endif 292 #endif
293 } 293 }
294 294
295 printing::BackgroundPrintingManager* 295 printing::BackgroundPrintingManager*
296 TestingBrowserProcess::background_printing_manager() { 296 TestingBrowserProcess::background_printing_manager() {
297 #if defined(ENABLE_FULL_PRINTING) 297 #if defined(ENABLE_PRINT_PREVIEW)
298 if (!background_printing_manager_.get()) { 298 if (!background_printing_manager_.get()) {
299 background_printing_manager_.reset( 299 background_printing_manager_.reset(
300 new printing::BackgroundPrintingManager()); 300 new printing::BackgroundPrintingManager());
301 } 301 }
302 return background_printing_manager_.get(); 302 return background_printing_manager_.get();
303 #else 303 #else
304 NOTIMPLEMENTED(); 304 NOTIMPLEMENTED();
305 return NULL; 305 return NULL;
306 #endif 306 #endif
307 } 307 }
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 441
442 /////////////////////////////////////////////////////////////////////////////// 442 ///////////////////////////////////////////////////////////////////////////////
443 443
444 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() { 444 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() {
445 TestingBrowserProcess::CreateInstance(); 445 TestingBrowserProcess::CreateInstance();
446 } 446 }
447 447
448 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() { 448 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() {
449 TestingBrowserProcess::DeleteInstance(); 449 TestingBrowserProcess::DeleteInstance();
450 } 450 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698