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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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"
11 #include "base/memory/ref_counted_memory.h" 11 #include "base/memory/ref_counted_memory.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
14 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 16 #include "base/values.h"
18 #include "build/build_config.h" 17 #include "build/build_config.h"
19 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chrome_notification_types.h" 19 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/extensions/extension_util.h" 20 #include "chrome/browser/extensions/extension_util.h"
22 #include "chrome/browser/first_run/first_run.h" 21 #include "chrome/browser/first_run/first_run.h"
(...skipping 14 matching lines...) Expand all
37 #include "chrome/browser/web_resource/notification_promo_helper.h" 36 #include "chrome/browser/web_resource/notification_promo_helper.h"
38 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
39 #include "chrome/common/pref_names.h" 38 #include "chrome/common/pref_names.h"
40 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
41 #include "chrome/grit/chromium_strings.h" 40 #include "chrome/grit/chromium_strings.h"
42 #include "chrome/grit/generated_resources.h" 41 #include "chrome/grit/generated_resources.h"
43 #include "chrome/grit/locale_settings.h" 42 #include "chrome/grit/locale_settings.h"
44 #include "components/bookmarks/common/bookmark_pref_names.h" 43 #include "components/bookmarks/common/bookmark_pref_names.h"
45 #include "components/browser_sync/browser/profile_sync_service.h" 44 #include "components/browser_sync/browser/profile_sync_service.h"
46 #include "components/google/core/browser/google_util.h" 45 #include "components/google/core/browser/google_util.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/web_resource/notification_promo.h" 48 #include "components/web_resource/notification_promo.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 "grit/browser_resources.h" 54 #include "grit/browser_resources.h"
55 #include "grit/components_strings.h" 55 #include "grit/components_strings.h"
56 #include "grit/theme_resources.h" 56 #include "grit/theme_resources.h"
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 // Get our template. 644 // Get our template.
645 static const base::StringPiece new_tab_theme_css( 645 static const base::StringPiece new_tab_theme_css(
646 ResourceBundle::GetSharedInstance().GetRawDataResource( 646 ResourceBundle::GetSharedInstance().GetRawDataResource(
647 IDR_NEW_TAB_4_THEME_CSS)); 647 IDR_NEW_TAB_4_THEME_CSS));
648 648
649 // Create the string from our template and the replacements. 649 // Create the string from our template and the replacements.
650 std::string css_string = 650 std::string css_string =
651 ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions); 651 ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
652 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 652 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
653 } 653 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_resource_cache.h ('k') | chrome/browser/ui/webui/options/browser_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698