Add base:: to string16 in chrome_frame/.

chrome_frame/turndown_prompt/turndown_prompt.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/turndown_prompt/turndown_prompt.h"
 
 #include <atlbase.h>
 #include <shlguid.h>
 
 #include "base/bind.h"
@@ skipping 25 matching lines @@
 void OnUninstallClicked(UrlLauncher* url_launcher);
 
 // Manages the Turndown UI in response to browsing ChromeFrame-rendered
 // pages.
 class BrowserObserver : public ReadyModeWebBrowserAdapter::Observer {
  public:
   BrowserObserver(IWebBrowser2* web_browser,
                   ReadyModeWebBrowserAdapter* adapter);
 
   // ReadyModeWebBrowserAdapter::Observer implementation
-  virtual void OnNavigateTo(const string16& url);
-  virtual void OnRenderInChromeFrame(const string16& url);
-  virtual void OnRenderInHost(const string16& url);
+  virtual void OnNavigateTo(const base::string16& url);
+  virtual void OnRenderInChromeFrame(const base::string16& url);
+  virtual void OnRenderInHost(const base::string16& url);
 
  private:
   // Shows the turndown prompt.
   void ShowPrompt();
   void Hide();
   // Returns a self-managed pointer that is not guaranteed to survive handling
   // of Windows events. For safety's sake, retrieve this pointer for each use
   // and do not store it for use outside of scope.
   InfobarManager* GetInfobarManager();
 
   GURL rendered_url_;
   base::win::ScopedComPtr<IWebBrowser2> web_browser_;
   ReadyModeWebBrowserAdapter* adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserObserver);
 };
 
 // Implements launching of a URL in an instance of IWebBrowser2.
 class UrlLauncherImpl : public UrlLauncher {
  public:
   explicit UrlLauncherImpl(IWebBrowser2* web_browser);
 
   // UrlLauncher implementation
-  void LaunchUrl(const string16& url);
+  void LaunchUrl(const base::string16& url);
 
  private:
   base::win::ScopedComPtr<IWebBrowser2> web_browser_;
 };
 
 UrlLauncherImpl::UrlLauncherImpl(IWebBrowser2* web_browser) {
   DCHECK(web_browser);
   web_browser_ = web_browser;
 }
 
-void UrlLauncherImpl::LaunchUrl(const string16& url) {
+void UrlLauncherImpl::LaunchUrl(const base::string16& url) {
   VARIANT flags = { VT_I4 };
   V_I4(&flags) = navOpenInNewWindow;
   base::win::ScopedBstr location(url.c_str());
 
   HRESULT hr = web_browser_->Navigate(location, &flags, NULL, NULL, NULL);
   DLOG_IF(ERROR, FAILED(hr)) << "Failed to invoke Navigate on IWebBrowser2. "
                              << "Error: " << hr;
 }
 
 BrowserObserver::BrowserObserver(IWebBrowser2* web_browser,
                                  ReadyModeWebBrowserAdapter* adapter)
     : web_browser_(web_browser),
       adapter_(adapter) {
 }
 
-void BrowserObserver::OnNavigateTo(const string16& url) {
+void BrowserObserver::OnNavigateTo(const base::string16& url) {
   if (!net::registry_controlled_domains::SameDomainOrHost(
           GURL(url),
           rendered_url_,
           net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
     rendered_url_ = GURL();
     Hide();
   }
 }
 
-void BrowserObserver::OnRenderInChromeFrame(const string16& url) {
+void BrowserObserver::OnRenderInChromeFrame(const base::string16& url) {
   ShowPrompt();
   rendered_url_ = GURL(url);
 }
 
-void BrowserObserver::OnRenderInHost(const string16& url) {
+void BrowserObserver::OnRenderInHost(const base::string16& url) {
   Hide();
   rendered_url_ = GURL(url);
 }
 
 void BrowserObserver::ShowPrompt() {
   // This pointer is self-managed and not guaranteed to survive handling of
   // Windows events. For safety's sake, retrieve this pointer for each use and
   // do not store it for use outside of scope.
   InfobarManager* infobar_manager = GetInfobarManager();
 
@@ skipping 153 matching lines @@
   // See if the prompt is explicitly suppressed via GP.
   return PolicySettings::GetInstance()->suppress_turndown_prompt();
 }
 
 void Configure(IWebBrowser2* web_browser) {
   if (!IsPromptSuppressed())
     InstallPrompts(web_browser);
 }
 
 }  // namespace turndown_prompt