commit c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d
author Torne (Richard Coles) <torne@google.com> Thu May 09 18:35:53 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Mon May 13 13:57:14 2013 +0100
tree 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a
parent 2d519ce2457219605d4f472da8d2ffd469796035

Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f

ash/shell/window_type_launcher.h

diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h
index 51376e8..de2159e 100644
--- a/ash/shell/window_type_launcher.h
+++ b/ash/shell/window_type_launcher.h
@@ -48,7 +48,7 @@
   // Overridden from views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
 
   // Overridden from views::ButtonListener: