Skip to content

Commit 66de7e3

Browse files
rogerwangrogerwang
committed
replace base::string16
1 parent a244392 commit 66de7e3

File tree

12 files changed

+20
-24
lines changed

12 files changed

+20
-24
lines changed

‎src/api/menu/menu_delegate.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "content/nw/src/api/menu/menu_delegate.h"
2222

2323
#include "base/logging.h"
24-
#include "base/strings/string16.h"
2524
#include "content/nw/src/api/object_manager.h"
2625
#include "content/nw/src/api/menuitem/menuitem.h"
2726

@@ -62,7 +61,7 @@ bool MenuDelegate::IsItemForCommandIdDynamic(int command_id) const {
6261
return item->is_modified_;
6362
}
6463

65-
base::string16 MenuDelegate::GetLabelForCommandId(int command_id) const {
64+
std::u16string MenuDelegate::GetLabelForCommandId(int command_id) const {
6665
MenuItem* item = object_manager_->GetApiObject<MenuItem>(command_id);
6766
return item->label_;
6867
}

‎src/api/menu/menu_delegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
4040
ui::Accelerator* accelerator) const override;
4141

4242
bool IsItemForCommandIdDynamic(int command_id) const override;
43-
base::string16 GetLabelForCommandId(int command_id) const override;
43+
std::u16string GetLabelForCommandId(int command_id) const override;
4444
ui::ImageModel GetIconForCommandId(int command_id) const override;
4545

4646
void ExecuteCommand(int command_id, int event_flags) override;

‎src/api/menuitem/menuitem.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class NSMenuItem;
3838
class MenuItemDelegate;
3939
#endif // __OBJC__
4040
#elif defined(OS_WIN) || defined(OS_LINUX)
41-
#include "base/strings/string16.h"
4241
#include "ui/gfx/image/image.h"
4342
#include "ui/base/accelerators/accelerator.h"
4443
#include "ui/views/focus/focus_manager.h"
@@ -130,8 +129,8 @@ class MenuItem : public Base {
130129
bool is_enabled_;
131130
gfx::Image icon_;
132131
std::string type_;
133-
base::string16 label_;
134-
base::string16 tooltip_;
132+
std::u16string label_;
133+
std::u16string tooltip_;
135134
Menu* submenu_;
136135
bool enable_shortcut_;
137136

‎src/api/nw_clipboard_api.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ SkBitmap _ReadImage(ui::Clipboard* clipboard) {
8989
private:
9090
bool ReadText(ClipboardData& data) {
9191
DCHECK(data.type == TYPE_TEXT);
92-
base::string16 text;
92+
std::u16string text;
9393
clipboard_->ReadText(ui::ClipboardBuffer::kCopyPaste, nullptr, &text);
9494
data.data.reset(new std::string(base::UTF16ToUTF8(text)));
9595
return true;
9696
}
9797

9898
bool ReadHTML(ClipboardData& data) {
9999
DCHECK(data.type == TYPE_HTML);
100-
base::string16 text;
100+
std::u16string text;
101101
std::string src_url;
102102
uint32_t fragment_start, fragment_end;
103103
clipboard_->ReadHTML(ui::ClipboardBuffer::kCopyPaste, nullptr,
@@ -331,9 +331,9 @@ NwClipboardReadAvailableTypesFunction::~NwClipboardReadAvailableTypesFunction()
331331

332332
bool NwClipboardReadAvailableTypesFunction::RunNWSync(base::ListValue* response, std::string* error) {
333333
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
334-
std::vector<base::string16> types;
334+
std::vector<std::u16string> types;
335335
clipboard->ReadAvailableTypes(ui::ClipboardBuffer::kCopyPaste, nullptr, &types);
336-
for(std::vector<base::string16>::iterator it = types.begin(); it != types.end(); it++) {
336+
for(std::vector<std::u16string>::iterator it = types.begin(); it != types.end(); it++) {
337337
if (base::EqualsASCII(*it, ui::kMimeTypeText)) {
338338
response->Append(base::WrapUnique(new base::Value(ToString(TYPE_TEXT))));
339339
} else if (base::EqualsASCII(*it, ui::kMimeTypeHTML)) {

‎src/api/nw_screen_api.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// For desktop capture APIs
1212
#include "base/base64.h"
13-
#include "base/strings/string16.h"
1413
#include "base/strings/utf_string_conversions.h"
1514
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
1615
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"

‎src/api/tray/tray_aura.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void Tray::Create(const base::DictionaryValue& option) {
6969
status_tray_ = g_browser_process->status_tray();
7070

7171
status_icon_ = status_tray_->CreateStatusIcon(StatusTray::NOTIFICATION_TRAY_ICON,
72-
gfx::ImageSkia(), base::string16());
72+
gfx::ImageSkia(), std::u16string());
7373
status_observer_ = new TrayObserver(this);
7474
status_icon_->AddObserver(status_observer_);
7575
}

‎src/browser/menubar_view.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ const char MenuBarView::kViewClassName[] = "BookmarkBarView";
3333

3434
class MenuBarButton : public views::MenuButton {
3535
public:
36-
MenuBarButton(const base::string16& title,
36+
MenuBarButton(const std::u16string& title,
3737
PressedCallback callback,
3838
bool show_menu_marker)
3939
: MenuButton(std::move(callback), title) {
4040
SetElideBehavior(kElideBehavior);
4141
}
4242

43-
base::string16 GetTooltipText(const gfx::Point& p) const override {
43+
std::u16string GetTooltipText(const gfx::Point& p) const override {
4444
if (label()->GetPreferredSize().width() > label()->size().width())
4545
return GetText();
46-
return base::string16();
46+
return std::u16string();
4747
}
4848

4949
private:

‎src/browser/menubar_view.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#ifndef NW_BROWSER_MENUBAR_VIEWS_H_
66
#define NW_BROWSER_MENUBAR_VIEWS_H_
77

8-
#include "base/strings/string16.h"
98
#include "ui/views/accessible_pane_view.h"
109
#include "ui/views/controls/button/button.h"
1110

‎src/nw_base.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace nw {
88
namespace {
99
Package* g_package;
1010
int exit_code;
11-
base::string16 g_current_new_win_manifest;
11+
std::u16string g_current_new_win_manifest;
1212
}
1313

1414
Package* package(const base::FilePath* path) {
@@ -53,11 +53,11 @@ int ExitCodeHook() {
5353
return exit_code;
5454
}
5555

56-
void SetCurrentNewWinManifest(const base::string16& manifest) {
56+
void SetCurrentNewWinManifest(const std::u16string& manifest) {
5757
g_current_new_win_manifest = manifest;
5858
}
5959

60-
const base::string16& GetCurrentNewWinManifest() {
60+
const std::u16string& GetCurrentNewWinManifest() {
6161
return g_current_new_win_manifest;
6262
}
6363

‎src/nw_base.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace nw {
1313
NW_EXPORT void ReleaseNWPackage();
1414
NW_EXPORT int ExitCodeHook();
1515
NW_EXPORT void SetExitCode(int);
16-
NW_EXPORT void SetCurrentNewWinManifest(const base::string16& manifest);
17-
NW_EXPORT const base::string16& GetCurrentNewWinManifest();
16+
NW_EXPORT void SetCurrentNewWinManifest(const std::u16string& manifest);
17+
NW_EXPORT const std::u16string& GetCurrentNewWinManifest();
1818
NW_EXPORT bool gcm_enabled();
1919
}
2020

‎src/nw_custom_bindings.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ void NWCustomBindings::EvalScript(
245245
web_frame = blink::WebFrame::FromCoreFrame(iframe->ContentFrame());
246246
}
247247
#if defined(OS_WIN)
248-
base::string16 jscript((WCHAR*)*v8::String::Value(isolate, args[1]));
248+
std::u16string jscript((WCHAR*)*v8::String::Value(isolate, args[1]));
249249
#else
250-
base::string16 jscript((char16_t*)*v8::String::Value(isolate, args[1]));
250+
std::u16string jscript((char16_t*)*v8::String::Value(isolate, args[1]));
251251
#endif
252252
if (web_frame) {
253253
blink::WebLocalFrame* local_frame = web_frame->ToWebLocalFrame();

‎src/nwjs_browsertest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ IN_PROC_BROWSER_TEST_F(NWAppTest, LocalFlash) {
840840
web_contents = BrowserList::GetInstance()->GetLastActive()->tab_strip_model()->GetActiveWebContents();
841841
}
842842
ASSERT_TRUE(web_contents);
843-
base::string16 expected_title(base::ASCIIToUTF16("Loaded"));
843+
std::u16string expected_title(base::ASCIIToUTF16("Loaded"));
844844
content::TitleWatcher title_watcher(web_contents, expected_title);
845845

846846
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());

0 commit comments

Comments
 (0)