diff options
Diffstat (limited to 'content/shell/browser/shell_views.cc')
| -rw-r--r-- | content/shell/browser/shell_views.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc index 273eef6..e137fcb 100644 --- a/content/shell/browser/shell_views.cc +++ b/content/shell/browser/shell_views.cc @@ -110,7 +110,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView, #endif } - void SetWindowTitle(const string16& title) { title_ = title; } + void SetWindowTitle(const base::string16& title) { title_ = title; } void EnableUIControl(UIControl control, bool is_enabled) { if (control == BACK_BUTTON) { back_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL @@ -215,7 +215,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView, } // Overridden from TextfieldController virtual void ContentsChanged(views::Textfield* sender, - const string16& new_contents) OVERRIDE { + const base::string16& new_contents) OVERRIDE { } virtual bool HandleKeyEvent(views::Textfield* sender, const ui::KeyEvent& key_event) OVERRIDE { @@ -248,7 +248,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView, // Overridden from WidgetDelegateView virtual bool CanResize() const OVERRIDE { return true; } virtual bool CanMaximize() const OVERRIDE { return true; } - virtual string16 GetWindowTitle() const OVERRIDE { + virtual base::string16 GetWindowTitle() const OVERRIDE { return title_; } virtual void WindowClosing() OVERRIDE { @@ -272,7 +272,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView, Shell* shell_; // Window title - string16 title_; + base::string16 title_; // Toolbar view contains forward/backward/reload button and URL entry View* toolbar_view_; @@ -387,7 +387,7 @@ void Shell::Close() { window_widget_->CloseNow(); } -void Shell::PlatformSetTitle(const string16& title) { +void Shell::PlatformSetTitle(const base::string16& title) { ShellWindowDelegateView* delegate_view = static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); delegate_view->SetWindowTitle(title); |