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

Side by Side Diff: chrome/browser/dom_distiller/profile_utils.cc

Issue 1253953002: Componentize enhanced_bookmark_features.{h,cc}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert change in //chrome/common/DEPS that broke checkdeps Created 5 years, 4 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 "chrome/browser/dom_distiller/profile_utils.h" 5 #include "chrome/browser/dom_distiller/profile_utils.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 9 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
10 #include "chrome/browser/dom_distiller/lazy_dom_distiller_service.h" 10 #include "chrome/browser/dom_distiller/lazy_dom_distiller_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/chrome_isolated_world_ids.h" 12 #include "chrome/common/chrome_isolated_world_ids.h"
13 #include "chrome/common/chrome_switches.h"
14 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h" 13 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
15 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h " 14 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h "
16 #include "components/dom_distiller/content/browser/external_feedback_reporter.h" 15 #include "components/dom_distiller/content/browser/external_feedback_reporter.h"
16 #include "components/dom_distiller/core/dom_distiller_switches.h"
17 #include "components/dom_distiller/core/url_constants.h" 17 #include "components/dom_distiller/core/url_constants.h"
18 18
19 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
20 #include "chrome/browser/android/dom_distiller/external_feedback_reporter_androi d.h" 20 #include "chrome/browser/android/dom_distiller/external_feedback_reporter_androi d.h"
21 #endif // defined(OS_ANDROID) 21 #endif // defined(OS_ANDROID)
22 22
23 void RegisterDomDistillerViewerSource(Profile* profile) { 23 void RegisterDomDistillerViewerSource(Profile* profile) {
24 const base::CommandLine& command_line = 24 const base::CommandLine& command_line =
25 *base::CommandLine::ForCurrentProcess(); 25 *base::CommandLine::ForCurrentProcess();
26 if (command_line.HasSwitch(switches::kEnableDomDistiller)) { 26 if (command_line.HasSwitch(switches::kEnableDomDistiller)) {
(...skipping 15 matching lines...) Expand all
42 dom_distiller::SetDistillerJavaScriptWorldId( 42 dom_distiller::SetDistillerJavaScriptWorldId(
43 chrome::ISOLATED_WORLD_ID_CHROME_INTERNAL); 43 chrome::ISOLATED_WORLD_ID_CHROME_INTERNAL);
44 } 44 }
45 45
46 content::URLDataSource::Add( 46 content::URLDataSource::Add(
47 profile, 47 profile,
48 new dom_distiller::DomDistillerViewerSource( 48 new dom_distiller::DomDistillerViewerSource(
49 lazy_service, dom_distiller::kDomDistillerScheme, reporter.Pass())); 49 lazy_service, dom_distiller::kDomDistillerScheme, reporter.Pass()));
50 } 50 }
51 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698