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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 102993018: Remove UTF string conversion functions from the global namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aaaaaaaaaa Created 6 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
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/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "ui/base/l10n/l10n_util.h" 46 #include "ui/base/l10n/l10n_util.h"
47 #include "ui/base/resource/resource_bundle.h" 47 #include "ui/base/resource/resource_bundle.h"
48 48
49 #if defined(OS_CHROMEOS) 49 #if defined(OS_CHROMEOS)
50 #include "chrome/browser/chromeos/policy/policy_cert_service.h" 50 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
51 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 51 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
52 #endif 52 #endif
53 53
54 using base::ASCIIToUTF16; 54 using base::ASCIIToUTF16;
55 using base::UTF8ToUTF16; 55 using base::UTF8ToUTF16;
56 using base::UTF16ToUTF8;
56 using content::BrowserThread; 57 using content::BrowserThread;
57 58
58 namespace { 59 namespace {
59 60
60 // The list of content settings types to display on the Website Settings UI. 61 // The list of content settings types to display on the Website Settings UI.
61 ContentSettingsType kPermissionType[] = { 62 ContentSettingsType kPermissionType[] = {
62 CONTENT_SETTINGS_TYPE_IMAGES, 63 CONTENT_SETTINGS_TYPE_IMAGES,
63 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 64 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
64 CONTENT_SETTINGS_TYPE_PLUGINS, 65 CONTENT_SETTINGS_TYPE_PLUGINS,
65 CONTENT_SETTINGS_TYPE_POPUPS, 66 CONTENT_SETTINGS_TYPE_POPUPS,
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 if (visited_before_today) { 680 if (visited_before_today) {
680 first_visit_text = l10n_util::GetStringFUTF16( 681 first_visit_text = l10n_util::GetStringFUTF16(
681 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 682 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
682 base::TimeFormatShortDate(first_visit)); 683 base::TimeFormatShortDate(first_visit));
683 } else { 684 } else {
684 first_visit_text = l10n_util::GetStringUTF16( 685 first_visit_text = l10n_util::GetStringUTF16(
685 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 686 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
686 } 687 }
687 ui_->SetFirstVisit(first_visit_text); 688 ui_->SetFirstVisit(first_visit_text);
688 } 689 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/external_protocol_dialog.cc ('k') | chrome/browser/webdata/autofill_profile_syncable_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698