Convert page contents grabbing from wide to UTF16. The current code is a bit...

chrome/browser/history/history_publisher.h

-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.

[Nico, 2010/06/10 21:03:35]

:-P

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_
 
 #include <vector>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/string16.h"

[Nico, 2010/06/10 21:03:35]

forward declare?

[brettw, 2010/06/11 21:01:04]

We can't forward declare a string16 since it's actually a typedef to some ugly
STL goop.

 
 #if defined(OS_WIN)
 #include "base/scoped_comptr_win.h"
 #include "history_indexer.h"
 #endif
 
 class GURL;
 
 namespace base {
 class Time;
 }
 
 namespace history {
 
 class HistoryPublisher {
  public:
   HistoryPublisher();
   ~HistoryPublisher();
 
   // Must call this function to complete initialization. Returns true if we
   // need to publish data to any indexers registered with us. Returns false if
   // there are none registered. On false, no other function should be called.
   bool Init();
 
   void PublishPageThumbnail(const std::vector<unsigned char>& thumbnail,
                             const GURL& url, const base::Time& time) const;
   void PublishPageContent(const base::Time& time, const GURL& url,
                           const std::wstring& title,
-                          const std::wstring& contents) const;
+                          const string16& contents) const;
   void DeleteUserHistoryBetween(const base::Time& begin_time,
                                 const base::Time& end_time) const;
 
  private:
   struct PageData {
     const base::Time& time;
     const GURL& url;
     const wchar_t* html;
     const wchar_t* title;
     const char* thumbnail_format;
@@ skipping 23 matching lines @@
 
   // The format of the thumbnail we pass to indexers.
   static const char* const kThumbnailImageFormat;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryPublisher);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_