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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_piece.h" 10 #include "base/strings/string_piece.h"
(...skipping 23 matching lines...) Expand all
34 #include "net/base/net_errors.h" 34 #include "net/base/net_errors.h"
35 #include "net/base/net_util.h" 35 #include "net/base/net_util.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
38 #include "ui/base/webui/jstemplate_builder.h" 38 #include "ui/base/webui/jstemplate_builder.h"
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 #include "base/win/windows_version.h" 41 #include "base/win/windows_version.h"
42 #endif 42 #endif
43 43
44 using base::ASCIIToUTF16;
44 using base::TimeTicks; 45 using base::TimeTicks;
45 using content::InterstitialPage; 46 using content::InterstitialPage;
46 using content::NavigationController; 47 using content::NavigationController;
47 using content::NavigationEntry; 48 using content::NavigationEntry;
48 49
49 namespace { 50 namespace {
50 51
51 // These represent the commands sent by ssl_roadblock.html. 52 // These represent the commands sent by ssl_roadblock.html.
52 enum SSLBlockingPageCommands { 53 enum SSLBlockingPageCommands {
53 CMD_DONT_PROCEED, 54 CMD_DONT_PROCEED,
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 strings->SetString(keys[i], std::string()); 431 strings->SetString(keys[i], std::string());
431 } 432 }
432 } 433 }
433 434
434 void SSLBlockingPage::OnGotHistoryCount(HistoryService::Handle handle, 435 void SSLBlockingPage::OnGotHistoryCount(HistoryService::Handle handle,
435 bool success, 436 bool success,
436 int num_visits, 437 int num_visits,
437 base::Time first_visit) { 438 base::Time first_visit) {
438 num_visits_ = num_visits; 439 num_visits_ = num_visits;
439 } 440 }
OLDNEW
« no previous file with comments | « chrome/browser/spellchecker/word_trimmer_unittest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698