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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 19 matching lines...) Expand all
30 #include "chrome/browser/ui/sync/sync_promo_ui.h" 30 #include "chrome/browser/ui/sync/sync_promo_ui.h"
31 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" 31 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
32 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 32 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
33 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h" 33 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
34 #include "chrome/browser/ui/webui/sync_setup_handler.h" 34 #include "chrome/browser/ui/webui/sync_setup_handler.h"
35 #include "chrome/browser/web_resource/notification_promo.h" 35 #include "chrome/browser/web_resource/notification_promo.h"
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/extensions/extension_constants.h" 37 #include "chrome/common/extensions/extension_constants.h"
38 #include "chrome/common/pref_names.h" 38 #include "chrome/common/pref_names.h"
39 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
40 #include "chrome/grit/chromium_strings.h"
41 #include "chrome/grit/generated_resources.h"
40 #include "components/google/core/browser/google_util.h" 42 #include "components/google/core/browser/google_util.h"
41 #include "content/public/browser/browser_thread.h" 43 #include "content/public/browser/browser_thread.h"
42 #include "content/public/browser/notification_service.h" 44 #include "content/public/browser/notification_service.h"
43 #include "content/public/browser/render_process_host.h" 45 #include "content/public/browser/render_process_host.h"
44 #include "extensions/common/extension.h" 46 #include "extensions/common/extension.h"
45 #include "grit/browser_resources.h" 47 #include "grit/browser_resources.h"
46 #include "grit/chromium_strings.h"
47 #include "grit/generated_resources.h"
48 #include "grit/locale_settings.h" 48 #include "grit/locale_settings.h"
49 #include "grit/theme_resources.h" 49 #include "grit/theme_resources.h"
50 #include "ui/base/l10n/l10n_util.h" 50 #include "ui/base/l10n/l10n_util.h"
51 #include "ui/base/resource/resource_bundle.h" 51 #include "ui/base/resource/resource_bundle.h"
52 #include "ui/base/theme_provider.h" 52 #include "ui/base/theme_provider.h"
53 #include "ui/base/webui/jstemplate_builder.h" 53 #include "ui/base/webui/jstemplate_builder.h"
54 #include "ui/base/webui/web_ui_util.h" 54 #include "ui/base/webui/web_ui_util.h"
55 #include "ui/gfx/animation/animation.h" 55 #include "ui/gfx/animation/animation.h"
56 #include "ui/gfx/color_utils.h" 56 #include "ui/gfx/color_utils.h"
57 #include "ui/gfx/sys_color_change_listener.h" 57 #include "ui/gfx/sys_color_change_listener.h"
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 // Get our template. 712 // Get our template.
713 static const base::StringPiece new_tab_theme_css( 713 static const base::StringPiece new_tab_theme_css(
714 ResourceBundle::GetSharedInstance().GetRawDataResource( 714 ResourceBundle::GetSharedInstance().GetRawDataResource(
715 IDR_NEW_TAB_4_THEME_CSS)); 715 IDR_NEW_TAB_4_THEME_CSS));
716 716
717 // Create the string from our template and the replacements. 717 // Create the string from our template and the replacements.
718 std::string css_string; 718 std::string css_string;
719 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); 719 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
720 new_tab_css_ = base::RefCountedString::TakeString(&css_string); 720 new_tab_css_ = base::RefCountedString::TakeString(&css_string);
721 } 721 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_login_handler.cc ('k') | chrome/browser/ui/webui/options/autofill_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698