renaesop 26135b412b Merge remote-tracking branch 'upstream/master' ... # Conflicts: # atom/browser/api/atom_api_web_contents.cc # chromium_src/chrome/browser/printing/print_job_worker.cc # chromium_src/chrome/browser/printing/print_job_worker.h # chromium_src/chrome/browser/printing/print_view_manager_base.cc # chromium_src/chrome/browser/printing/print_view_manager_base.h # chromium_src/chrome/browser/printing/printer_query.cc # chromium_src/chrome/common/print_messages.cc # chromium_src/chrome/renderer/printing/print_web_view_helper.cc		2017-02-07 09:30:36 +08:00
..
extensions	Update to API changes of Chrome 52	2016-07-04 15:32:43 +09:00
media	WindowCapturer and ScreenCapturer are merged to DesktopCapturer	2017-02-06 10:34:28 -08:00
printing	Merge remote-tracking branch 'upstream/master'	2017-02-07 09:30:36 +08:00
profiles	Add printing related source codes from chrome.	2014-08-21 15:43:11 +08:00
renderer_host/pepper	enable_pepper_cdms is now a feature flag	2017-02-06 10:34:28 -08:00
speech	Update to API changes of Chrome 52	2016-07-04 15:32:43 +09:00
ssl	Fix error due to search for openssl headers	2017-02-06 10:34:29 -08:00
ui	Fix Debug building on Windows	2017-02-06 10:34:29 -08:00
browser_process.cc	Reorder BrowserProcess constructor to avoid invalid memory	2017-01-12 16:55:26 -08:00
browser_process.h	Update to API changes of Chrome 52	2016-07-04 15:32:43 +09:00
certificate_manager_model.cc	Adapt to changes of Chrome 51 API changes (Part 2)	2016-05-23 12:29:14 +09:00
certificate_manager_model.h	Update to API changes of Chrome 52	2016-07-04 15:32:43 +09:00
chrome_notification_types.h	Fix typos in comments.	2016-03-07 20:22:03 -08:00
chrome_process_finder_win.cc	win: Pass original command line	2015-10-22 17:52:06 +08:00
chrome_process_finder_win.h	Copy back the original versions of Chromium files in	2015-10-20 14:05:07 -07:00
process_singleton.h	Fix compilation errors on OS X	2016-03-10 17:06:21 +09:00
process_singleton_posix.cc	ScopedTempDir::path is replaced with GetPath	2017-02-06 10:34:29 -08:00
process_singleton_win.cc	Create user_data_dir before creating singleton lock	2016-04-27 21:52:50 +09:00