diff options
Diffstat (limited to 'chrome/browser/ui/views')
32 files changed, 91 insertions, 84 deletions
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc index c5a8b95..886f7b9 100644 --- a/chrome/browser/ui/views/apps/native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/native_app_window_views.cc @@ -299,7 +299,7 @@ void NativeAppWindowViews::InitializeDefaultWindow( } #if defined(OS_WIN) - string16 app_name_wide = UTF8ToWide(app_name); + base::string16 app_name_wide = UTF8ToWide(app_name); HWND hwnd = GetNativeAppWindowHWND(); ui::win::SetAppIdForWindow(ShellIntegration::GetAppModelIdForProfile( app_name_wide, profile()->GetPath()), hwnd); diff --git a/chrome/browser/ui/views/apps/native_app_window_views.h b/chrome/browser/ui/views/apps/native_app_window_views.h index 10b69c6..4c4338b 100644 --- a/chrome/browser/ui/views/apps/native_app_window_views.h +++ b/chrome/browser/ui/views/apps/native_app_window_views.h @@ -127,7 +127,7 @@ class NativeAppWindowViews : public apps::NativeAppWindow, virtual views::View* GetInitiallyFocusedView() OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; - virtual string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetWindowTitle() const OVERRIDE; virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc index aae3926..a16b79f 100644 --- a/chrome/browser/ui/views/external_tab_container_win.cc +++ b/chrome/browser/ui/views/external_tab_container_win.cc @@ -753,11 +753,12 @@ void ExternalTabContainerWin::AddNewContents(WebContents* source, } } -void ExternalTabContainerWin::WebContentsCreated(WebContents* source_contents, - int64 source_frame_id, - const string16& frame_name, - const GURL& target_url, - WebContents* new_contents) { +void ExternalTabContainerWin::WebContentsCreated( + WebContents* source_contents, + int64 source_frame_id, + const base::string16& frame_name, + const GURL& target_url, + WebContents* new_contents) { if (!load_requests_via_automation_) return; @@ -802,7 +803,7 @@ void ExternalTabContainerWin::UpdateTargetURL(WebContents* source, int32 page_id, const GURL& url) { if (automation_) { - string16 url_string = base::UTF8ToUTF16(url.spec()); + base::string16 url_string = base::UTF8ToUTF16(url.spec()); automation_->Send( new AutomationMsg_UpdateTargetUrl(tab_handle_, url_string)); } @@ -1021,7 +1022,7 @@ void ExternalTabContainerWin::RegisterProtocolHandler( WebContents* tab, const std::string& protocol, const GURL& url, - const string16& title, + const base::string16& title, bool user_gesture) { Browser::RegisterProtocolHandlerHelper(tab, protocol, url, title, user_gesture, NULL); @@ -1071,11 +1072,11 @@ bool ExternalTabContainerWin::OnMessageReceived(const IPC::Message& message) { void ExternalTabContainerWin::DidFailProvisionalLoad( int64 frame_id, - const string16& frame_unique_name, + const base::string16& frame_unique_name, bool is_main_frame, const GURL& validated_url, int error_code, - const string16& error_description, + const base::string16& error_description, content::RenderViewHost* render_view_host) { if (automation_) { automation_->Send(new AutomationMsg_NavigationFailed( diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 7b74f2e..030e7bb 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -42,7 +42,7 @@ void FirstRunBubble::Init() { views::Label* title = new views::Label(l10n_util::GetStringFUTF16( IDS_FR_BUBBLE_TITLE, browser_ ? - GetDefaultSearchEngineName(browser_->profile()) : string16())); + GetDefaultSearchEngineName(browser_->profile()) : base::string16())); title->SetFont(original_font.DeriveFont(2, gfx::Font::BOLD)); views::Link* change = diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc index 11bdb83..bbc3345 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc @@ -87,7 +87,7 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); gfx::Image avatar; gfx::Image taskbar_badge_avatar; - string16 text; + base::string16 text; bool is_rectangle = false; if (browser_view_->IsGuestSession()) { avatar = rb.GetImageNamed(browser_view_->GetGuestIconResourceID()); @@ -148,7 +148,7 @@ void BrowserNonClientFrameView::UpdateNewStyleAvatarInfo( if (browser_view_->ShouldShowAvatar()) { if (!new_avatar_button_) { - string16 profile_name = + base::string16 profile_name = profiles::GetActiveProfileDisplayName(browser_view_->browser()); new_avatar_button_ = new NewAvatarButton( listener, profile_name, style, browser_view_->browser()); diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index 3ebb52b..06ded06 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -94,17 +94,17 @@ int BrowserRootView::OnPerformDrop(const ui::DropTargetEvent& event) { // do this as the TabStrip doesn't know about the autocomplete edit and needs // to know about it to handle 'paste and go'. GURL url; - string16 title; + base::string16 title; ui::OSExchangeData mapped_data; if (!event.data().GetURLAndTitle(&url, &title) || !url.is_valid()) { // The url isn't valid. Use the paste and go url. if (GetPasteAndGoURL(event.data(), &url)) - mapped_data.SetURL(url, string16()); + mapped_data.SetURL(url, base::string16()); // else case: couldn't extract a url or 'paste and go' url. This ends up // passing through an ui::OSExchangeData with nothing in it. We need to do // this so that the tab strip cleans up properly. } else { - mapped_data.SetURL(url, string16()); + mapped_data.SetURL(url, base::string16()); } forwarding_to_tab_strip_ = false; scoped_ptr<ui::DropTargetEvent> mapped_event( @@ -185,7 +185,7 @@ bool BrowserRootView::GetPasteAndGoURL(const ui::OSExchangeData& data, if (!data.HasString()) return false; - string16 text; + base::string16 text; if (!data.GetString(&text) || text.empty()) return false; text = AutocompleteMatch::SanitizeString(text); diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 6149121..ed77b66 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1215,8 +1215,8 @@ void BrowserView::ShowTranslateBubble( #if defined(ENABLE_ONE_CLICK_SIGNIN) void BrowserView::ShowOneClickSigninBubble( OneClickSigninBubbleType type, - const string16& email, - const string16& error_message, + const base::string16& email, + const base::string16& error_message, const StartSyncCallback& start_sync_callback) { scoped_ptr<OneClickSigninBubbleDelegate> delegate; delegate.reset(new OneClickSigninBubbleLinksDelegate(browser())); diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index a053d2c..d53f373 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -333,8 +333,8 @@ class BrowserView : public BrowserWindow, #if defined(ENABLE_ONE_CLICK_SIGNIN) virtual void ShowOneClickSigninBubble( OneClickSigninBubbleType type, - const string16& email, - const string16& error_message, + const base::string16& email, + const base::string16& error_message, const StartSyncCallback& start_sync_callback) OVERRIDE; #endif // TODO(beng): Not an override, move somewhere else. @@ -397,8 +397,8 @@ class BrowserView : public BrowserWindow, virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; virtual bool CanActivate() const OVERRIDE; - virtual string16 GetWindowTitle() const OVERRIDE; - virtual string16 GetAccessibleWindowTitle() const OVERRIDE; + virtual base::string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetAccessibleWindowTitle() const OVERRIDE; virtual views::View* GetInitiallyFocusedView() OVERRIDE; virtual bool ShouldShowWindowTitle() const OVERRIDE; virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE; diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc index fb3bc91..ee53aaa 100644 --- a/chrome/browser/ui/views/frame/browser_view_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc @@ -120,7 +120,7 @@ TEST_F(BrowserViewTest, BrowserViewLayout) { // Bookmark bar is reparented to BrowserView on NTP. NavigateAndCommitActiveTabWithTitle(browser, GURL(chrome::kChromeUINewTabURL), - string16()); + base::string16()); EXPECT_TRUE(bookmark_bar->visible()); EXPECT_TRUE(bookmark_bar->IsDetached()); EXPECT_EQ(browser_view(), bookmark_bar->parent()); @@ -148,7 +148,7 @@ TEST_F(BrowserViewTest, BrowserViewLayout) { // Bookmark bar is parented back to top container on normal page. NavigateAndCommitActiveTabWithTitle(browser, GURL("about:blank"), - string16()); + base::string16()); EXPECT_FALSE(bookmark_bar->visible()); EXPECT_FALSE(bookmark_bar->IsDetached()); EXPECT_EQ(top_container, bookmark_bar->parent()); diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc index 7ce3bef..87cee29 100644 --- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc +++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc @@ -42,13 +42,13 @@ void BrowserWindowPropertyManager::UpdateWindowProperties(HWND hwnd) { // Set the app user model id for this application to that of the application // name. See http://crbug.com/7028. - string16 app_id = browser->is_app() ? + base::string16 app_id = browser->is_app() ? ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(browser->app_name()), profile->GetPath()) : ShellIntegration::GetChromiumModelIdForProfile(profile->GetPath()); - string16 icon_path_string; - string16 command_line_string; - string16 pinned_name; + base::string16 icon_path_string; + base::string16 command_line_string; + base::string16 pinned_name; ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileShortcutManager* shortcut_manager = NULL; diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc index fcecb76..5b91665 100644 --- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc +++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc @@ -290,7 +290,7 @@ struct GlobalMenuBarX11::HistoryItem { HistoryItem() : session_id(0) {} // The title for the menu item. - string16 title; + base::string16 title; // The URL that will be navigated to if the user selects this item. GURL url; @@ -525,7 +525,7 @@ void GlobalMenuBarX11::AddHistoryItemToMenu(HistoryItem* item, DbusmenuMenuitem* menu, int tag, int index) { - string16 title = item->title; + base::string16 title = item->title; std::string url_string = item->url.possibly_invalid_spec(); if (title.empty()) diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h index 34ecde5..667d844 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h @@ -76,7 +76,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView, // OpaqueBrowserFrameViewLayoutDelegate implementation: virtual bool ShouldShowWindowIcon() const OVERRIDE; virtual bool ShouldShowWindowTitle() const OVERRIDE; - virtual string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetWindowTitle() const OVERRIDE; virtual int GetIconSize() const OVERRIDE; virtual bool ShouldLeaveOffsetNearTopBorder() const OVERRIDE; virtual gfx::Size GetBrowserViewMinimumSize() const OVERRIDE; diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h index a0be77a..7c0e61a 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h @@ -17,7 +17,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { // mode. virtual bool ShouldShowWindowIcon() const = 0; virtual bool ShouldShowWindowTitle() const = 0; - virtual string16 GetWindowTitle() const = 0; + virtual base::string16 GetWindowTitle() const = 0; // Returns the size of the window icon. This can be platform dependent // because of differences in fonts, so its part of the interface. diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc index 6c841700..c4ebbc7 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc @@ -224,7 +224,7 @@ class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase { } void AddAvatarLabel() { - avatar_label_ = new views::MenuButton(NULL, string16(), NULL, false); + avatar_label_ = new views::MenuButton(NULL, base::string16(), NULL, false); avatar_label_->set_id(VIEW_ID_AVATAR_LABEL); root_view_->AddChildView(avatar_label_); @@ -233,7 +233,8 @@ class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase { } void AddNewAvatarButton() { - new_avatar_button_ = new views::MenuButton(NULL, string16(), NULL, false); + new_avatar_button_ = + new views::MenuButton(NULL, base::string16(), NULL, false); new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON); root_view_->AddChildView(new_avatar_button_); } diff --git a/chrome/browser/ui/views/frame/system_menu_model_delegate.h b/chrome/browser/ui/views/frame/system_menu_model_delegate.h index e2c5ba0..15b8bb6 100644 --- a/chrome/browser/ui/views/frame/system_menu_model_delegate.h +++ b/chrome/browser/ui/views/frame/system_menu_model_delegate.h @@ -26,7 +26,7 @@ class SystemMenuModelDelegate : public ui::SimpleMenuModel::Delegate { int command_id, ui::Accelerator* accelerator) OVERRIDE; virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE; - virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE; + virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE; virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE; private: diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index bba8065..5986aa6 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -124,7 +124,7 @@ int HungPagesTableModel::RowCount() { string16 HungPagesTableModel::GetText(int row, int column_id) { DCHECK(row >= 0 && row < RowCount()); - string16 title = tab_observers_[row]->web_contents()->GetTitle(); + base::string16 title = tab_observers_[row]->web_contents()->GetTitle(); if (title.empty()) title = CoreTabHelper::GetDefaultTitle(); // TODO(xji): Consider adding a special case if the title text is a URL, diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h index 8cd912d..2f4c945 100644 --- a/chrome/browser/ui/views/hung_renderer_view.h +++ b/chrome/browser/ui/views/hung_renderer_view.h @@ -49,7 +49,7 @@ class HungPagesTableModel : public ui::TableModel, public views::TableGrouper { // Overridden from ui::TableModel: virtual int RowCount() OVERRIDE; - virtual string16 GetText(int row, int column_id) OVERRIDE; + virtual base::string16 GetText(int row, int column_id) OVERRIDE; virtual gfx::ImageSkia GetIcon(int row) OVERRIDE; virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; @@ -120,10 +120,11 @@ class HungRendererDialogView : public views::DialogDelegateView, virtual void EndForWebContents(content::WebContents* contents); // views::DialogDelegateView overrides: - virtual string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetWindowTitle() const OVERRIDE; virtual void WindowClosing() OVERRIDE; virtual int GetDialogButtons() const OVERRIDE; - virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; + virtual base::string16 GetDialogButtonLabel( + ui::DialogButton button) const OVERRIDE; virtual views::View* CreateExtraView() OVERRIDE; virtual bool Accept(bool window_closing) OVERRIDE; virtual bool UseNewStyleForThisDialog() const OVERRIDE; diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 9912ff1..fedebf5b 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -360,7 +360,7 @@ void LocationBarView::Init() { star_view_->SetVisible(false); AddChildView(star_view_); - search_button_ = new views::LabelButton(this, string16()); + search_button_ = new views::LabelButton(this, base::string16()); search_button_->set_triggerable_event_flags( ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON); search_button_->SetStyle(views::Button::STYLE_BUTTON); diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.cc b/chrome/browser/ui/views/message_center/web_notification_tray.cc index 88124f3..7268b5d 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray.cc @@ -237,9 +237,9 @@ void WebNotificationTray::UpdateStatusIcon() { int unread_notifications = message_center()->UnreadNotificationCount(); - string16 tool_tip; + base::string16 tool_tip; if (unread_notifications > 0) { - string16 str_unread_count = base::FormatNumber(unread_notifications); + base::string16 str_unread_count = base::FormatNumber(unread_notifications); tool_tip = l10n_util::GetStringFUTF16(IDS_MESSAGE_CENTER_TOOLTIP_UNREAD, str_unread_count); } else { @@ -320,7 +320,7 @@ MessageCenterTray* WebNotificationTray::GetMessageCenterTray() { } void WebNotificationTray::CreateStatusIcon(const gfx::ImageSkia& image, - const string16& tool_tip) { + const base::string16& tool_tip) { if (status_icon_) return; diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.h b/chrome/browser/ui/views/message_center/web_notification_tray.h index 15fea40..b2df8dc 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray.h +++ b/chrome/browser/ui/views/message_center/web_notification_tray.h @@ -87,7 +87,8 @@ class WebNotificationTray : public message_center::MessageCenterTrayDelegate, PositionInfo GetPositionInfo(); - void CreateStatusIcon(const gfx::ImageSkia& image, const string16& tool_tip); + void CreateStatusIcon(const gfx::ImageSkia& image, + const base::string16& tool_tip); void DestroyStatusIcon(); void AddQuietModeMenu(StatusIcon* status_icon); MessageCenterWidgetDelegate* GetMessageCenterWidgetDelegateForTest(); diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc index 0f413fa..d7c740c 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc @@ -67,7 +67,7 @@ class WebNotificationTrayTest : public InProcessBrowserTest { ASCIIToUTF16("Test Web Notification"), ASCIIToUTF16("Notification message body."), blink::WebTextDirectionDefault, - string16(), + base::string16(), ASCIIToUTF16(replace_id), new TestNotificationDelegate(id)); @@ -82,7 +82,7 @@ class WebNotificationTrayTest : public InProcessBrowserTest { ASCIIToUTF16("Updated Web Notification"), ASCIIToUTF16("Updated message body."), blink::WebTextDirectionDefault, - string16(), + base::string16(), ASCIIToUTF16(replace_id), new TestNotificationDelegate(new_id)); diff --git a/chrome/browser/ui/views/passwords/manage_password_item_view.cc b/chrome/browser/ui/views/passwords/manage_password_item_view.cc index e1e7aba..3779b75 100644 --- a/chrome/browser/ui/views/passwords/manage_password_item_view.cc +++ b/chrome/browser/ui/views/passwords/manage_password_item_view.cc @@ -69,7 +69,7 @@ ManagePasswordItemView::ManagePasswordItemView( label_2_->SetEnabled(false); label_2_->SetUnderline(false); - delete_button_ = new views::LabelButton(this, string16()); + delete_button_ = new views::LabelButton(this, base::string16()); delete_button_->SetStyle(views::Button::STYLE_TEXTBUTTON); delete_button_->SetImage(views::Button::STATE_NORMAL, *rb->GetImageSkiaNamed(IDR_CLOSE_2)); @@ -92,10 +92,10 @@ ManagePasswordItemView::ManagePasswordItemView( // static string16 ManagePasswordItemView::GetPasswordDisplayString( - const string16& password) { + const base::string16& password) { const wchar_t kPasswordBullet = 0x2022; const size_t kMaxPasswordChar = 22; - return string16(std::min(password.length(), kMaxPasswordChar), + return base::string16(std::min(password.length(), kMaxPasswordChar), kPasswordBullet); } diff --git a/chrome/browser/ui/views/passwords/manage_password_item_view.h b/chrome/browser/ui/views/passwords/manage_password_item_view.h index 75139e0..d53c486 100644 --- a/chrome/browser/ui/views/passwords/manage_password_item_view.h +++ b/chrome/browser/ui/views/passwords/manage_password_item_view.h @@ -25,7 +25,8 @@ class ManagePasswordItemView : public views::View, int field_1_width, int field_2_width); - static string16 GetPasswordDisplayString(const string16& password); + static base::string16 GetPasswordDisplayString( + const base::string16& password); private: virtual ~ManagePasswordItemView(); diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc index 159d3ff..4a38203c 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc @@ -35,7 +35,7 @@ void UpdateBiggestWidth(const autofill::PasswordForm& password_form, int* biggest_width) { ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance(); gfx::FontList font_list(rb->GetFontList(ui::ResourceBundle::BaseFont)); - string16 display_string(username ? + base::string16 display_string(username ? password_form.username_value : ManagePasswordItemView::GetPasswordDisplayString( password_form.password_value)); diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc index b58e683..e1ad5e7 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc @@ -57,7 +57,7 @@ void ManagePasswordsIconView::SetTooltip(bool password_to_be_saved) { } bool ManagePasswordsIconView::GetTooltipText(const gfx::Point& p, - string16* tooltip) const { + base::string16* tooltip) const { // Don't show tooltip if the password bubble is displayed. return !ManagePasswordsBubbleView::IsShowing() && ImageView::GetTooltipText(p, tooltip); diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_view.h b/chrome/browser/ui/views/passwords/manage_passwords_icon_view.h index 44147d2..a215a73 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_icon_view.h +++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_view.h @@ -37,7 +37,7 @@ class ManagePasswordsIconView : public views::ImageView { private: // views::ImageView: virtual bool GetTooltipText(const gfx::Point& p, - string16* tooltip) const OVERRIDE; + base::string16* tooltip) const OVERRIDE; virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h index 17f35e5..2056b52 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.h +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h @@ -56,7 +56,7 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver, // DialogDelegateView: virtual bool CanResize() const OVERRIDE; - virtual string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetWindowTitle() const OVERRIDE; virtual void DeleteDelegate() OVERRIDE; virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE; virtual bool Cancel() OVERRIDE; diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h index c1bdc13..c0f66a2 100644 --- a/chrome/browser/ui/views/status_bubble_views.h +++ b/chrome/browser/ui/views/status_bubble_views.h @@ -54,7 +54,7 @@ class StatusBubbleViews : public StatusBubble { void SetBubbleWidth(int width); // Overridden from StatusBubble: - virtual void SetStatus(const string16& status) OVERRIDE; + virtual void SetStatus(const base::string16& status) OVERRIDE; virtual void SetURL(const GURL& url, const std::string& languages) OVERRIDE; virtual void Hide() OVERRIDE; virtual void MouseMoved(const gfx::Point& location, @@ -94,10 +94,10 @@ class StatusBubbleViews : public StatusBubble { int GetMaxStatusBubbleWidth(); // The status text we want to display when there are no URLs to display. - string16 status_text_; + base::string16 status_text_; // The url we want to display when there is no status text to display. - string16 url_text_; + base::string16 url_text_; // The original, non-elided URL. GURL url_; diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h index 06f0610..100a474 100644 --- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h +++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h @@ -35,8 +35,9 @@ class TabModalConfirmDialogViews : public TabModalConfirmDialog, content::WebContents* web_contents); // views::DialogDelegate: - virtual string16 GetWindowTitle() const OVERRIDE; - virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE; + virtual base::string16 GetWindowTitle() const OVERRIDE; + virtual base::string16 GetDialogButtonLabel( + ui::DialogButton button) const OVERRIDE; virtual bool Cancel() OVERRIDE; virtual bool Accept() OVERRIDE; virtual bool Close() OVERRIDE; diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc index 0436925..2e25363 100644 --- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc @@ -54,7 +54,7 @@ class PermissionMenuButton : public views::MenuButton, // |PermissionMenuButton|. If the |show_menu_marker| flag is true, then a // small icon is be displayed next to the button |text|, indicating that the // button opens a drop down menu. - PermissionMenuButton(const string16& text, + PermissionMenuButton(const base::string16& text, PermissionMenuModel* model, bool show_menu_marker); virtual ~PermissionMenuButton(); @@ -63,7 +63,7 @@ class PermissionMenuButton : public views::MenuButton, virtual gfx::Size GetPreferredSize() OVERRIDE; // Overridden from views::TextButton. - virtual void SetText(const string16& text) OVERRIDE; + virtual void SetText(const base::string16& text) OVERRIDE; // Overridden from views::View. virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; @@ -83,7 +83,7 @@ class PermissionMenuButton : public views::MenuButton, // PermissionMenuButton /////////////////////////////////////////////////////////////////////////////// -PermissionMenuButton::PermissionMenuButton(const string16& text, +PermissionMenuButton::PermissionMenuButton(const base::string16& text, PermissionMenuModel* model, bool show_menu_marker) : MenuButton(NULL, text, this, show_menu_marker), @@ -115,7 +115,7 @@ gfx::Size PermissionMenuButton::GetPreferredSize() { return prefsize; } -void PermissionMenuButton::SetText(const string16& text) { +void PermissionMenuButton::SetText(const base::string16& text) { MenuButton::SetText(text); SizeToPreferredSize(); } diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index 085063d..c6afe7d 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -116,11 +116,11 @@ class PopupHeaderView : public views::View { virtual ~PopupHeaderView(); // Sets the name of the site's identity. - void SetIdentityName(const string16& name); + void SetIdentityName(const base::string16& name); // Sets the |status_text| for the identity check of this site and the // |text_color|. - void SetIdentityStatus(const string16& status_text, SkColor text_color); + void SetIdentityStatus(const base::string16& status_text, SkColor text_color); private: // The label that displays the name of the site's identity. @@ -173,7 +173,7 @@ PopupHeaderView::PopupHeaderView(views::ButtonListener* close_button_listener) layout->AddPaddingRow(0, kHeaderPaddingTop); layout->StartRow(0, label_column); - name_ = new views::Label(string16()); + name_ = new views::Label(base::string16()); gfx::Font headline_font(name_->font().GetFontName(), kIdentityNameFontSize); name_->SetFont(headline_font.DeriveFont(0, gfx::Font::BOLD)); layout->AddView(name_, 1, 1, views::GridLayout::LEADING, @@ -193,7 +193,7 @@ PopupHeaderView::PopupHeaderView(views::ButtonListener* close_button_listener) layout->AddPaddingRow(0, kHeaderRowSpacing); layout->StartRow(0, label_column); - status_ = new views::Label(string16()); + status_ = new views::Label(base::string16()); layout->AddView(status_, 1, 1, @@ -206,11 +206,11 @@ PopupHeaderView::PopupHeaderView(views::ButtonListener* close_button_listener) PopupHeaderView::~PopupHeaderView() { } -void PopupHeaderView::SetIdentityName(const string16& name) { +void PopupHeaderView::SetIdentityName(const base::string16& name) { name_->SetText(name); } -void PopupHeaderView::SetIdentityStatus(const string16& status, +void PopupHeaderView::SetIdentityStatus(const base::string16& status, SkColor text_color) { status_->SetText(status); status_->SetEnabledColor(text_color); @@ -428,7 +428,7 @@ void WebsiteSettingsPopupView::SetCookieInfo( for (CookieInfoList::const_iterator i(cookie_info_list.begin()); i != cookie_info_list.end(); ++i) { - string16 label_text = l10n_util::GetStringFUTF16( + base::string16 label_text = l10n_util::GetStringFUTF16( IDS_WEBSITE_SETTINGS_SITE_DATA_STATS_LINE, UTF8ToUTF16(i->cookie_source), base::IntToString16(i->allowed), @@ -492,7 +492,7 @@ void WebsiteSettingsPopupView::SetPermissionInfo( void WebsiteSettingsPopupView::SetIdentityInfo( const IdentityInfo& identity_info) { - string16 identity_status_text; + base::string16 identity_status_text; SkColor text_color = SK_ColorBLACK; switch (identity_info.identity_status) { case WebsiteSettings::SITE_IDENTITY_STATUS_CERT: @@ -518,7 +518,7 @@ void WebsiteSettingsPopupView::SetIdentityInfo( // site's identity was verified, then the headline contains the organization // name from the provided certificate. If the organization name is not // available than the hostname of the site is used instead. - string16 headline; + base::string16 headline; if (identity_info.cert_id) { cert_id_ = identity_info.cert_id; certificate_dialog_link_ = new views::Link( @@ -529,14 +529,14 @@ void WebsiteSettingsPopupView::SetIdentityInfo( ResetConnectionSection( identity_info_content_, WebsiteSettingsUI::GetIdentityIcon(identity_info.identity_status), - string16(), // The identity section has no headline. + base::string16(), // The identity section has no headline. UTF8ToUTF16(identity_info.identity_status_description), certificate_dialog_link_); ResetConnectionSection( connection_info_content_, WebsiteSettingsUI::GetConnectionIcon(identity_info.connection_status), - string16(), // The connection section has no headline. + base::string16(), // The connection section has no headline. UTF8ToUTF16(identity_info.connection_status_description), NULL); @@ -545,7 +545,8 @@ void WebsiteSettingsPopupView::SetIdentityInfo( SizeToContents(); } -void WebsiteSettingsPopupView::SetFirstVisit(const string16& first_visit) { +void WebsiteSettingsPopupView::SetFirstVisit( + const base::string16& first_visit) { ResetConnectionSection( page_info_content_, WebsiteSettingsUI::GetFirstVisitIcon(first_visit), @@ -623,7 +624,7 @@ views::View* WebsiteSettingsPopupView::CreateConnectionTab() { } views::View* WebsiteSettingsPopupView::CreateSection( - const string16& headline_text, + const base::string16& headline_text, views::View* content, views::Link* link) { views::View* container = new views::View(); @@ -665,8 +666,8 @@ views::View* WebsiteSettingsPopupView::CreateSection( void WebsiteSettingsPopupView::ResetConnectionSection( views::View* section_container, const gfx::Image& icon, - const string16& headline, - const string16& text, + const base::string16& headline, + const base::string16& text, views::Link* link) { section_container->RemoveAllChildViews(true); diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h index 15d0a42..c3a4e9b 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h @@ -85,7 +85,7 @@ class WebsiteSettingsPopupView virtual void SetPermissionInfo( const PermissionInfoList& permission_info_list) OVERRIDE; virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE; - virtual void SetFirstVisit(const string16& first_visit) OVERRIDE; + virtual void SetFirstVisit(const base::string16& first_visit) OVERRIDE; virtual void SetSelectedTab(TabId tab_id) OVERRIDE; // Creates the contents of the "Permissions" tab. The ownership of the @@ -100,7 +100,7 @@ class WebsiteSettingsPopupView // section |contents| and an optional |link|. This method creates a section // for the given |headline|, |contents| and |link|. |link| can be NULL if the // section should not contain a link. - views::View* CreateSection(const string16& headline, + views::View* CreateSection(const base::string16& headline, views::View* contents, views::Link* link) WARN_UNUSED_RESULT; @@ -112,8 +112,8 @@ class WebsiteSettingsPopupView // the views hierarchy. If the |link| is NULL then no link is be displayed. void ResetConnectionSection(views::View* section_container, const gfx::Image& icon, - const string16& headline, - const string16& text, + const base::string16& headline, + const base::string16& text, views::Link* link); // Handles LinkClicked asynchronously. void HandleLinkClickedAsync(views::Link* source); |