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

Side by Side Diff: components/dom_distiller/core/viewer.cc

Issue 601733002: Rename component_resources.h to components_resources.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: output_name hack Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/dom_distiller/core/viewer.h" 5 #include "components/dom_distiller/core/viewer.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "components/dom_distiller/core/distilled_page_prefs.h" 13 #include "components/dom_distiller/core/distilled_page_prefs.h"
14 #include "components/dom_distiller/core/dom_distiller_service.h" 14 #include "components/dom_distiller/core/dom_distiller_service.h"
15 #include "components/dom_distiller/core/proto/distilled_article.pb.h" 15 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
16 #include "components/dom_distiller/core/proto/distilled_page.pb.h" 16 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
17 #include "components/dom_distiller/core/task_tracker.h" 17 #include "components/dom_distiller/core/task_tracker.h"
18 #include "components/dom_distiller/core/url_constants.h" 18 #include "components/dom_distiller/core/url_constants.h"
19 #include "components/dom_distiller/core/url_utils.h" 19 #include "components/dom_distiller/core/url_utils.h"
20 #include "grit/component_resources.h" 20 #include "grit/components_resources.h"
21 #include "grit/components_strings.h" 21 #include "grit/components_strings.h"
22 #include "net/base/escape.h" 22 #include "net/base/escape.h"
23 #include "net/url_request/url_request.h" 23 #include "net/url_request/url_request.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 namespace dom_distiller { 28 namespace dom_distiller {
29 29
30 namespace { 30 namespace {
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 } 245 }
246 246
247 const std::string GetDistilledPageFontFamilyJs( 247 const std::string GetDistilledPageFontFamilyJs(
248 DistilledPagePrefs::FontFamily font_family) { 248 DistilledPagePrefs::FontFamily font_family) {
249 return "useFontFamily('" + GetJsFontFamily(font_family) + "');"; 249 return "useFontFamily('" + GetJsFontFamily(font_family) + "');";
250 } 250 }
251 251
252 } // namespace viewer 252 } // namespace viewer
253 253
254 } // namespace dom_distiller 254 } // namespace dom_distiller
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698