Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: ui/views/controls/message_box_view.h

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/menu/native_menu_win.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/message_box_view.h
diff --git a/ui/views/controls/message_box_view.h b/ui/views/controls/message_box_view.h
index 1d92a379be4e8b2f8112b641178fa519360388d5..27403e7c4e9a1e58d84493aefe0d3f20f94f188c 100644
--- a/ui/views/controls/message_box_view.h
+++ b/ui/views/controls/message_box_view.h
@@ -42,12 +42,12 @@ class VIEWS_EXPORT MessageBoxView : public View {
};
struct VIEWS_EXPORT InitParams {
- explicit InitParams(const string16& message);
+ explicit InitParams(const base::string16& message);
~InitParams();
uint16 options;
- string16 message;
- string16 default_prompt;
+ base::string16 message;
+ base::string16 default_prompt;
int message_width;
int inter_row_vertical_spacing;
};
@@ -60,7 +60,7 @@ class VIEWS_EXPORT MessageBoxView : public View {
views::Textfield* text_box() { return prompt_field_; }
// Returns user entered data in the prompt field.
- string16 GetInputText();
+ base::string16 GetInputText();
// Returns true if a checkbox is selected, false otherwise. (And false if
// the message box has no checkbox.)
@@ -73,14 +73,14 @@ class VIEWS_EXPORT MessageBoxView : public View {
// Adds a checkbox with the specified label to the message box if this is the
// first call. Otherwise, it changes the label of the current checkbox. To
// start, the message box has no checkbox until this function is called.
- void SetCheckBoxLabel(const string16& label);
+ void SetCheckBoxLabel(const base::string16& label);
// Sets the state of the check-box.
void SetCheckBoxSelected(bool selected);
// Sets the text and the listener of the link. If |text| is empty, the link
// is removed.
- void SetLink(const string16& text, LinkListener* listener);
+ void SetLink(const base::string16& text, LinkListener* listener);
// View:
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
« no previous file with comments | « ui/views/controls/menu/native_menu_win.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698