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

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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/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" 13 #include "base/prefs/pref_service.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/webui/metrics_handler.h" 16 #include "chrome/browser/ui/webui/metrics_handler.h"
17 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h" 17 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h"
18 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h" 18 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
19 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h" 19 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
20 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" 20 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
21 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" 21 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
22 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h" 22 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
23 #include "chrome/common/chrome_notification_types.h" 23 #include "chrome/common/chrome_notification_types.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource, 381 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
382 const char* mime_type, 382 const char* mime_type,
383 int resource_id) { 383 int resource_id) {
384 DCHECK(resource); 384 DCHECK(resource);
385 DCHECK(mime_type); 385 DCHECK(mime_type);
386 resource_map_[std::string(resource)] = 386 resource_map_[std::string(resource)] =
387 std::make_pair(std::string(mime_type), resource_id); 387 std::make_pair(std::string(mime_type), resource_id);
388 } 388 }
389 389
390 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {} 390 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {}
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc ('k') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698