Skip to content

Commit 99e9431

Browse files
GnorTechrogerwang
GnorTech
authored and
rogerwang
committed
rebase fix for windows; build ok
1 parent 2ccd9f8 commit 99e9431

33 files changed

+657
-74
lines changed

‎nw.gypi

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,16 @@
166166
'src/api/window/window.h',
167167
'src/browser/app_controller_mac.h',
168168
'src/browser/app_controller_mac.mm',
169+
'src/browser/autofill_popup_base_view.cc',
170+
'src/browser/autofill_popup_base_view.h',
169171
'src/browser/autofill_popup_view_gtk.cc',
170172
'src/browser/autofill_popup_view_gtk.h',
171173
'src/browser/autofill_popup_view_cocoa.h',
172174
'src/browser/autofill_popup_view_cocoa.mm',
173175
'src/browser/autofill_popup_view_bridge.h',
174176
'src/browser/autofill_popup_view_bridge.mm',
177+
'src/browser/autofill_popup_view_views.cc',
178+
'src/browser/autofill_popup_view_views.h',
175179
'src/browser/autofill_popup_controller_impl.cc',
176180
'src/browser/autofill_popup_controller_impl.h',
177181
'src/browser/tab_autofill_manager_delegate.cc',
@@ -236,7 +240,7 @@
236240
'src/browser/shell_javascript_dialog.h',
237241
'src/browser/shell_login_dialog_gtk.cc',
238242
'src/browser/shell_login_dialog_mac.mm',
239-
'src/browser/shell_login_dialog_win.cc',
243+
#FIXME 'src/browser/shell_login_dialog_win.cc',
240244
'src/browser/shell_login_dialog.cc',
241245
'src/browser/shell_login_dialog.h',
242246
'src/browser/shell_resource_dispatcher_host_delegate.cc',
@@ -708,11 +712,11 @@
708712
'VCLinkerTool': {
709713
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
710714
},
711-
'VCManifestTool': {
712-
'AdditionalManifestFiles': [
713-
'$(ProjectDir)\\nw\\src\\nw.exe.manifest',
714-
],
715-
},
715+
#'VCManifestTool': {
716+
# 'AdditionalManifestFiles': [
717+
# '$(ProjectDir)\\nw\\src\\nw.exe.manifest',
718+
# ],
719+
# },
716720
},
717721
'conditions': [
718722
['OS=="win" and win_use_allocator_shim==1', {

‎src/api/clipboard/clipboard.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ std::string Clipboard::GetText() {
7575
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
7676
base::string16 text;
7777
clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text);
78-
return UTF16ToUTF8(text);
78+
return base::UTF16ToUTF8(text);
7979
}
8080

8181
void Clipboard::Clear() {

‎src/api/menu/menu_delegate_win.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ bool MenuDelegate::IsItemForCommandIdDynamic(int command_id) const {
6262
return item->is_modified_;
6363
}
6464

65-
string16 MenuDelegate::GetLabelForCommandId(int command_id) const {
65+
base::string16 MenuDelegate::GetLabelForCommandId(int command_id) const {
6666
MenuItem* item = dispatcher_host_->GetApiObject<MenuItem>(command_id);
6767
return item->label_;
6868
}

‎src/api/menu/menu_delegate_win.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) { return false; }
4141

4242
virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
43-
virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
43+
virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
4444
virtual bool GetIconForCommandId(int command_id,
4545
gfx::Image* icon) const OVERRIDE;
4646

‎src/api/menu/menu_win.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void Menu::Insert(MenuItem* menu_item, int pos) {
131131
}
132132

133133
void Menu::Remove(MenuItem* menu_item, int pos) {
134-
menu_model_->RemoveAt(pos);
134+
menu_model_->RemoveItemAt(pos);
135135
is_menu_modified_ = true;
136136
}
137137

‎src/api/menuitem/menuitem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ class MenuItem : public Base {
145145
bool is_enabled_;
146146
gfx::Image icon_;
147147
std::string type_;
148-
string16 label_;
149-
string16 tooltip_;
148+
base::string16 label_;
149+
base::string16 tooltip_;
150150
Menu* submenu_;
151151
bool enable_shortcut_;
152152

‎src/api/menuitem/menuitem_win.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void MenuItem::OnClick() {
112112

113113
void MenuItem::SetLabel(const std::string& label) {
114114
is_modified_ = true;
115-
label_ = UTF8ToUTF16(label);
115+
label_ = base::UTF8ToUTF16(label);
116116
}
117117

118118
void MenuItem::SetIcon(const std::string& icon) {
@@ -129,7 +129,7 @@ void MenuItem::SetIcon(const std::string& icon) {
129129
}
130130

131131
void MenuItem::SetTooltip(const std::string& tooltip) {
132-
tooltip_ = UTF8ToUTF16(tooltip);
132+
tooltip_ = base::UTF8ToUTF16(tooltip);
133133
}
134134

135135
void MenuItem::SetEnabled(bool enabled) {
@@ -253,4 +253,4 @@ ui::KeyboardCode GetKeycodeFromText(std::string text){
253253
}
254254
}
255255
return retval;
256-
}
256+
}

‎src/api/tray/tray_win.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void Tray::SetIcon(const std::string& path) {
8787
}
8888

8989
void Tray::SetTooltip(const std::string& tooltip) {
90-
status_icon_->SetToolTip(UTF8ToUTF16(tooltip));
90+
status_icon_->SetToolTip(base::UTF8ToUTF16(tooltip));
9191
}
9292

9393
void Tray::SetMenu(Menu* menu) {

‎src/breakpad_win.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
269269

270270
// Common g_custom_entries.
271271
g_custom_entries->push_back(
272-
google_breakpad::CustomInfoEntry(L"ver", UTF16ToWide(version).c_str()));
272+
google_breakpad::CustomInfoEntry(L"ver", base::UTF16ToWide(version).c_str()));
273273
g_custom_entries->push_back(
274-
google_breakpad::CustomInfoEntry(L"prod", UTF16ToWide(product).c_str()));
274+
google_breakpad::CustomInfoEntry(L"prod", base::UTF16ToWide(product).c_str()));
275275
g_custom_entries->push_back(
276276
google_breakpad::CustomInfoEntry(L"plat", L"Win32"));
277277
g_custom_entries->push_back(
@@ -287,7 +287,7 @@ google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
287287

288288
if (!special_build.empty())
289289
g_custom_entries->push_back(google_breakpad::CustomInfoEntry(
290-
L"special", UTF16ToWide(special_build).c_str()));
290+
L"special", base::UTF16ToWide(special_build).c_str()));
291291

292292
if (type == L"plugin" || type == L"ppapi") {
293293
std::wstring plugin_path =
@@ -659,7 +659,7 @@ static void InitPipeNameEnvVar(bool is_per_user_install) {
659659
pipe_name = kGoogleUpdatePipeName;
660660
pipe_name += user_sid;
661661
}
662-
env->SetVar(kPipeNameVar, WideToASCII(pipe_name));
662+
env->SetVar(kPipeNameVar, base::UTF16ToASCII(pipe_name));
663663
}
664664

665665
void InitDefaultCrashCallback(LPTOP_LEVEL_EXCEPTION_FILTER filter) {
@@ -717,7 +717,7 @@ void InitCrashReporter() {
717717
InitDefaultCrashCallback(default_filter);
718718
return;
719719
}
720-
std::wstring pipe_name = ASCIIToWide(pipe_name_ascii);
720+
std::wstring pipe_name = base::ASCIIToWide(pipe_name_ascii);
721721

722722
#ifdef _WIN64
723723
// The protocol for connecting to the out-of-process Breakpad crash

0 commit comments

Comments
 (0)