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

Side by Side Diff: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/ui/webui/ntp/ntp_resource_cache.h" 5 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 34 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
37 #include "chrome/common/url_constants.h" 37 #include "chrome/common/url_constants.h"
38 #include "chrome/grit/browser_resources.h" 38 #include "chrome/grit/browser_resources.h"
39 #include "chrome/grit/chromium_strings.h" 39 #include "chrome/grit/chromium_strings.h"
40 #include "chrome/grit/generated_resources.h" 40 #include "chrome/grit/generated_resources.h"
41 #include "chrome/grit/locale_settings.h" 41 #include "chrome/grit/locale_settings.h"
42 #include "chrome/grit/theme_resources.h" 42 #include "chrome/grit/theme_resources.h"
43 #include "components/bookmarks/common/bookmark_pref_names.h" 43 #include "components/bookmarks/common/bookmark_pref_names.h"
44 #include "components/browser_sync/browser/profile_sync_service.h" 44 #include "components/browser_sync/profile_sync_service.h"
45 #include "components/google/core/browser/google_util.h" 45 #include "components/google/core/browser/google_util.h"
46 #include "components/prefs/pref_service.h" 46 #include "components/prefs/pref_service.h"
47 #include "components/signin/core/browser/signin_manager.h" 47 #include "components/signin/core/browser/signin_manager.h"
48 #include "components/strings/grit/components_strings.h" 48 #include "components/strings/grit/components_strings.h"
49 #include "content/public/browser/browser_thread.h" 49 #include "content/public/browser/browser_thread.h"
50 #include "content/public/browser/notification_service.h" 50 #include "content/public/browser/notification_service.h"
51 #include "content/public/browser/render_process_host.h" 51 #include "content/public/browser/render_process_host.h"
52 #include "extensions/common/extension.h" 52 #include "extensions/common/extension.h"
53 #include "extensions/common/extension_urls.h" 53 #include "extensions/common/extension_urls.h"
54 #include "ui/base/l10n/l10n_util.h" 54 #include "ui/base/l10n/l10n_util.h"
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 // Get our template. 602 // Get our template.
603 static const base::StringPiece new_tab_theme_css( 603 static const base::StringPiece new_tab_theme_css(
604 ResourceBundle::GetSharedInstance().GetRawDataResource( 604 ResourceBundle::GetSharedInstance().GetRawDataResource(
605 IDR_NEW_TAB_4_THEME_CSS)); 605 IDR_NEW_TAB_4_THEME_CSS));
606 606
607 // Create the string from our template and the replacements. 607 // Create the string from our template and the replacements.
608 std::string css_string = 608 std::string css_string =
609 ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions); 609 ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
610 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 610 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
611 } 611 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698