chrome/browser/ui/webui/ntp/ntp_resource_cache.cc - Issue 8992034: Merge 114608, 115692 to 963 (M17) branch.

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

Issue 8992034: Merge 114608, 115692 to 963 (M17) branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/

Patch Set: rebasing, checking for diffs before merge Created 8 years, 12 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

« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_login_handler.cc ('k') | chrome/browser/ui/webui/sync_promo/sync_promo_handler.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 <vector>	7 #include <vector>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/file_util.h"	10 #include "base/file_util.h"

11 #include "base/memory/ref_counted_memory.h"	11 #include "base/memory/ref_counted_memory.h"

12 #include "base/string16.h"	12 #include "base/string16.h"

13 #include "base/string_number_conversions.h"	13 #include "base/string_number_conversions.h"

14 #include "base/stringprintf.h"	14 #include "base/stringprintf.h"

15 #include "base/time.h"	15 #include "base/time.h"

16 #include "base/utf_string_conversions.h"	16 #include "base/utf_string_conversions.h"

17 #include "base/values.h"	17 #include "base/values.h"

18 #include "chrome/browser/defaults.h"	18 #include "chrome/browser/defaults.h"

19 #include "chrome/browser/google/google_util.h"	19 #include "chrome/browser/google/google_util.h"

20 #include "chrome/browser/prefs/pref_service.h"	20 #include "chrome/browser/prefs/pref_service.h"

21 #include "chrome/browser/profiles/profile.h"	21 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/sync/profile_sync_service.h"	22 #include "chrome/browser/sync/profile_sync_service.h"

23 #include "chrome/browser/themes/theme_service.h"	23 #include "chrome/browser/themes/theme_service.h"

24 #include "chrome/browser/themes/theme_service_factory.h"	24 #include "chrome/browser/themes/theme_service_factory.h"

25 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	25 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

26 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"	26 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"

27 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"	27 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

28 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"	28 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"

29 #include "chrome/browser/ui/webui/sync_promo_ui.h"	29 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

30 #include "chrome/browser/ui/webui/sync_setup_handler.h"	30 #include "chrome/browser/ui/webui/sync_setup_handler.h"

31 #include "chrome/browser/web_resource/promo_resource_service.h"	31 #include "chrome/browser/web_resource/promo_resource_service.h"

32 #include "chrome/common/chrome_notification_types.h"	32 #include "chrome/common/chrome_notification_types.h"

33 #include "chrome/common/chrome_switches.h"	33 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/extensions/extension.h"	34 #include "chrome/common/extensions/extension.h"

35 #include "chrome/common/extensions/extension_constants.h"	35 #include "chrome/common/extensions/extension_constants.h"

36 #include "chrome/common/jstemplate_builder.h"	36 #include "chrome/common/jstemplate_builder.h"

37 #include "chrome/common/pref_names.h"	37 #include "chrome/common/pref_names.h"

38 #include "chrome/common/url_constants.h"	38 #include "chrome/common/url_constants.h"

39 #include "content/public/browser/browser_thread.h"	39 #include "content/public/browser/browser_thread.h"

(...skipping 468 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
508 // Get our template.	508 // Get our template.

509 static const base::StringPiece new_tab_theme_css(	509 static const base::StringPiece new_tab_theme_css(

510 ResourceBundle::GetSharedInstance().GetRawDataResource(	510 ResourceBundle::GetSharedInstance().GetRawDataResource(

511 IDR_NEW_TAB_4_THEME_CSS));	511 IDR_NEW_TAB_4_THEME_CSS));

512	512

513 // Create the string from our template and the replacements.	513 // Create the string from our template and the replacements.

514 std::string css_string;	514 std::string css_string;

515 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);	515 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);

516 new_tab_css_ = base::RefCountedString::TakeString(&css_string);	516 new_tab_css_ = base::RefCountedString::TakeString(&css_string);

517 }	517 }

OLD	NEW