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

Side by Side Diff: chrome/browser/ui/webui/ntp/new_tab_ui.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 (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/new_tab_ui.h" 5 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/webui/metrics_handler.h" 16 #include "chrome/browser/ui/webui/metrics_handler.h"
18 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" 17 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
19 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 18 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
20 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h" 19 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h"
21 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" 20 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
22 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h" 21 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
23 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" 22 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
24 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" 23 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
25 #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h" 24 #include "chrome/browser/ui/webui/ntp/ntp_user_data_logger.h"
26 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
27 #include "chrome/grit/generated_resources.h" 26 #include "chrome/grit/generated_resources.h"
28 #include "components/bookmarks/common/bookmark_pref_names.h" 27 #include "components/bookmarks/common/bookmark_pref_names.h"
29 #include "components/pref_registry/pref_registry_syncable.h" 28 #include "components/pref_registry/pref_registry_syncable.h"
29 #include "components/prefs/pref_service.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/notification_service.h" 31 #include "content/public/browser/notification_service.h"
32 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
33 #include "content/public/browser/render_view_host.h" 33 #include "content/public/browser/render_view_host.h"
34 #include "content/public/browser/url_data_source.h" 34 #include "content/public/browser/url_data_source.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/browser/web_ui.h" 36 #include "content/public/browser/web_ui.h"
37 #include "extensions/browser/extension_system.h" 37 #include "extensions/browser/extension_system.h"
38 #include "grit/browser_resources.h" 38 #include "grit/browser_resources.h"
39 #include "ui/base/l10n/l10n_util.h" 39 #include "ui/base/l10n/l10n_util.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource, 341 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
342 const char* mime_type, 342 const char* mime_type,
343 int resource_id) { 343 int resource_id) {
344 DCHECK(resource); 344 DCHECK(resource);
345 DCHECK(mime_type); 345 DCHECK(mime_type);
346 resource_map_[std::string(resource)] = 346 resource_map_[std::string(resource)] =
347 std::make_pair(std::string(mime_type), resource_id); 347 std::make_pair(std::string(mime_type), resource_id);
348 } 348 }
349 349
350 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {} 350 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {}
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.h ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698