OLD | NEW |
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 "apps/app_launcher.h" |
10 #include "base/command_line.h" | 11 #include "base/command_line.h" |
11 #include "base/file_util.h" | 12 #include "base/file_util.h" |
12 #include "base/memory/ref_counted_memory.h" | 13 #include "base/memory/ref_counted_memory.h" |
13 #include "base/prefs/pref_service.h" | 14 #include "base/prefs/pref_service.h" |
14 #include "base/string16.h" | 15 #include "base/string16.h" |
15 #include "base/stringprintf.h" | 16 #include "base/stringprintf.h" |
16 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
17 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
18 #include "base/values.h" | 19 #include "base/values.h" |
19 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.h" |
20 #include "chrome/browser/extensions/app_launcher.h" | |
21 #include "chrome/browser/first_run/first_run.h" | 21 #include "chrome/browser/first_run/first_run.h" |
22 #include "chrome/browser/google/google_util.h" | 22 #include "chrome/browser/google/google_util.h" |
23 #include "chrome/browser/policy/browser_policy_connector.h" | 23 #include "chrome/browser/policy/browser_policy_connector.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/sync/profile_sync_service.h" | 25 #include "chrome/browser/sync/profile_sync_service.h" |
26 #include "chrome/browser/sync/profile_sync_service_factory.h" | 26 #include "chrome/browser/sync/profile_sync_service_factory.h" |
27 #include "chrome/browser/themes/theme_service.h" | 27 #include "chrome/browser/themes/theme_service.h" |
28 #include "chrome/browser/themes/theme_service_factory.h" | 28 #include "chrome/browser/themes/theme_service_factory.h" |
29 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 29 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
30 #include "chrome/browser/ui/search/search.h" | 30 #include "chrome/browser/ui/search/search.h" |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 | 187 |
188 bool NTPResourceCache::NewTabCacheNeedsRefresh() { | 188 bool NTPResourceCache::NewTabCacheNeedsRefresh() { |
189 #if defined(OS_MACOSX) | 189 #if defined(OS_MACOSX) |
190 // Invalidate if the current value is different from the cached value. | 190 // Invalidate if the current value is different from the cached value. |
191 bool is_enabled = platform_util::IsSwipeTrackingFromScrollEventsEnabled(); | 191 bool is_enabled = platform_util::IsSwipeTrackingFromScrollEventsEnabled(); |
192 if (is_enabled != is_swipe_tracking_from_scroll_events_enabled_) { | 192 if (is_enabled != is_swipe_tracking_from_scroll_events_enabled_) { |
193 is_swipe_tracking_from_scroll_events_enabled_ = is_enabled; | 193 is_swipe_tracking_from_scroll_events_enabled_ = is_enabled; |
194 return true; | 194 return true; |
195 } | 195 } |
196 #endif | 196 #endif |
197 bool should_show_apps_page = !extensions::IsAppLauncherEnabled(); | 197 bool should_show_apps_page = !apps::WasAppLauncherEnabled(); |
198 if (should_show_apps_page != should_show_apps_page_) { | 198 if (should_show_apps_page != should_show_apps_page_) { |
199 should_show_apps_page_ = should_show_apps_page; | 199 should_show_apps_page_ = should_show_apps_page; |
200 return true; | 200 return true; |
201 } | 201 } |
202 return false; | 202 return false; |
203 } | 203 } |
204 | 204 |
205 base::RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { | 205 base::RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) { |
206 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 206 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
207 if (is_incognito) { | 207 if (is_incognito) { |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
586 static const base::StringPiece new_tab_theme_css( | 586 static const base::StringPiece new_tab_theme_css( |
587 ResourceBundle::GetSharedInstance().GetRawDataResource( | 587 ResourceBundle::GetSharedInstance().GetRawDataResource( |
588 chrome::search::IsInstantExtendedAPIEnabled(profile_) ? | 588 chrome::search::IsInstantExtendedAPIEnabled(profile_) ? |
589 IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS)); | 589 IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS)); |
590 | 590 |
591 // Create the string from our template and the replacements. | 591 // Create the string from our template and the replacements. |
592 std::string css_string; | 592 std::string css_string; |
593 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); | 593 css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL); |
594 new_tab_css_ = base::RefCountedString::TakeString(&css_string); | 594 new_tab_css_ = base::RefCountedString::TakeString(&css_string); |
595 } | 595 } |
OLD | NEW |