Chromium Code Reviews Chromium Code Reviews
Issue 340403004:
Java wrapper for DistilledPagePrefs. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: components/dom_distiller/content/dom_distiller_viewer_source.cc |
| diff --git a/components/dom_distiller/content/dom_distiller_viewer_source.cc b/components/dom_distiller/content/dom_distiller_viewer_source.cc |
| index 4d89f06a528bfe9244bc5c812f5e8ddb8b16dbd0..ee7556c3a2e4a557229f49849bceb91ee8a70a23 100644 |
| --- a/components/dom_distiller/content/dom_distiller_viewer_source.cc |
| +++ b/components/dom_distiller/content/dom_distiller_viewer_source.cc |
| @@ -12,13 +12,9 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/message_loop/message_loop.h" |
| #include "base/strings/utf_string_conversions.h" |
| -<<<<<<< ours |
|
nyquist
2014/07/08 01:02:33
I don't think this is in the checked-in version of
sunangel
2014/07/08 20:40:58
Should not be in CL, removed
On 2014/07/08 01:02:3
|
| -#include "components/dom_distiller/core/dom_distiller_service.h" |
| -#include "components/dom_distiller/core/reader_mode_preferences.h" |
| -======= |
| #include "components/dom_distiller/core/distilled_page_prefs.h" |
| #include "components/dom_distiller/core/dom_distiller_service.h" |
| ->>>>>>> theirs |
| + |
| #include "components/dom_distiller/core/task_tracker.h" |
| #include "components/dom_distiller/core/url_constants.h" |
| #include "components/dom_distiller/core/viewer.h" |
