components/dom_distiller/core/viewer.cc - Issue 341563002: Theme Preferences for Distilled Pages

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/dom_distiller/core/viewer.cc

Issue 341563002: Theme Preferences for Distilled Pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Implmented CSS Classes, rebased CSS, added Javascript for instantaneous changes Created 6 years, 6 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:

Index: components/dom_distiller/core/viewer.cc

diff --git a/components/dom_distiller/core/viewer.cc b/components/dom_distiller/core/viewer.cc

index e3c77962dce2a522e0c6ae5ccf016f09629151eb..e8f194409c099efb5f3690448720529e3a011a72 100644

--- a/components/dom_distiller/core/viewer.cc

+++ b/components/dom_distiller/core/viewer.cc

@@ -13,6 +13,7 @@

#include "components/dom_distiller/core/dom_distiller_service.h"

#include "components/dom_distiller/core/proto/distilled_article.pb.h"

#include "components/dom_distiller/core/proto/distilled_page.pb.h"

+#include "components/dom_distiller/core/reader_mode_preferences.h"

nyquist 2014/06/26 20:39:59 Remove this.

smaslo 2014/06/27 18:33:18 Now needed for enum declaration.

#include "components/dom_distiller/core/task_tracker.h"

#include "components/dom_distiller/core/url_constants.h"

#include "components/dom_distiller/core/url_utils.h"

@@ -128,9 +129,8 @@ const std::string GetErrorPageHtml() {

}

const std::string GetCss() {

- return ResourceBundle::GetSharedInstance()

- .GetRawDataResource(IDR_DISTILLER_CSS)

- .as_string();

+ return ResourceBundle::GetSharedInstance().GetRawDataResource(

nyquist 2014/06/26 20:39:59 Even though this is not wrong, I'd just revert thi

smaslo 2014/06/27 18:33:18 Done.

+ IDR_DISTILLER_CSS).as_string();

}

const std::string GetJavaScript() {