Skip to content

Commit 2803deb

Browse files
rogerwangrogerwang
committed
rebase to Chromium 55
1 parent 252c875 commit 2803deb

16 files changed

+32
-29
lines changed

‎patch/patches/ffmpeg.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/BUILD.gn b/BUILD.gn
2-
index 642cb00..c1f8b96 100755
2+
index 2099985..2f13616 100755
33
--- BUILD.gn
44
+++ BUILD.gn
5-
@@ -363,6 +363,12 @@ if (is_component_ffmpeg) {
5+
@@ -362,6 +362,12 @@ if (is_component_ffmpeg) {
66
# So we can append below and assume they're defined.
77
ldflags = []
88

‎src/api/nw_clipboard_api.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,14 @@ bool NwClipboardReadAvailableTypesFunction::RunNWSync(base::ListValue* response,
317317
clipboard->ReadAvailableTypes(ui::CLIPBOARD_TYPE_COPY_PASTE, &types, &contains_filenames);
318318
for(std::vector<base::string16>::iterator it = types.begin(); it != types.end(); it++) {
319319
if (base::EqualsASCII(*it, ui::Clipboard::kMimeTypeText)) {
320-
response->Append(new base::StringValue(ToString(TYPE_TEXT)));
320+
response->Append(base::WrapUnique(new base::StringValue(ToString(TYPE_TEXT))));
321321
} else if (base::EqualsASCII(*it, ui::Clipboard::kMimeTypeHTML)) {
322-
response->Append(new base::StringValue(ToString(TYPE_HTML)));
322+
response->Append(base::WrapUnique(new base::StringValue(ToString(TYPE_HTML))));
323323
} else if (base::EqualsASCII(*it, ui::Clipboard::kMimeTypeRTF)) {
324-
response->Append(new base::StringValue(ToString(TYPE_RTF)));
324+
response->Append(base::WrapUnique(new base::StringValue(ToString(TYPE_RTF))));
325325
} else if (base::EqualsASCII(*it, ui::Clipboard::kMimeTypePNG)) {
326-
response->Append(new base::StringValue(ToString(TYPE_PNG)));
327-
response->Append(new base::StringValue(ToString(TYPE_JPEG)));
326+
response->Append(base::WrapUnique(new base::StringValue(ToString(TYPE_PNG))));
327+
response->Append(base::WrapUnique(new base::StringValue(ToString(TYPE_JPEG))));
328328
}
329329
}
330330
return true;

‎src/api/nw_menu_api.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ namespace extensions {
1313

1414
#ifndef OS_MACOSX
1515
bool NwMenuGetNSStringWithFixupFunction::RunNWSync(base::ListValue* response, std::string* error) {
16-
error_ = "NwMenuGetNSStringWithFixupFunction is only for OSX";
16+
SetError("NwMenuGetNSStringWithFixupFunction is only for OSX");
1717
return false;
1818
}
1919

2020
bool NwMenuGetNSStringFWithFixupFunction::RunNWSync(base::ListValue* response, std::string* error) {
21-
error_ = "NwMenuGetNSStringFWithFixupFunction is only for OSX";
21+
SetError("NwMenuGetNSStringFWithFixupFunction is only for OSX");
2222
return false;
2323
}
2424
#endif

‎src/api/nw_screen_api.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include "base/base64.h"
1313
#include "base/strings/string16.h"
1414
#include "base/strings/utf_string_conversions.h"
15-
#include "chrome/browser/media/desktop_media_list_observer.h"
16-
#include "chrome/browser/media/desktop_streams_registry.h"
17-
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
18-
#include "chrome/browser/media/native_desktop_media_list.h"
15+
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
16+
#include "chrome/browser/media/webrtc/desktop_streams_registry.h"
17+
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
18+
#include "chrome/browser/media/webrtc/native_desktop_media_list.h"
1919
#include "content/public/browser/render_frame_host.h"
2020
#include "content/public/browser/render_process_host.h"
2121
#include "content/public/browser/web_contents.h"

‎src/api/nw_window_api.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ bool NwCurrentWindowInternalGetWinParamInternalFunction::RunNWSync(base::ListVal
687687
result->Set("id", new base::StringValue(app_window->window_key()));
688688
app_window->GetSerializedState(result);
689689

690-
response->Append(result);
690+
response->Append(base::WrapUnique(result));
691691

692692
return true;
693693
}

‎src/api/object_manager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void ObjectManager::SendEvent(Base* object,
228228
if (!event_router)
229229
return;
230230
std::unique_ptr<base::ListValue> arguments(args.DeepCopy());
231-
arguments->Insert(0, new base::FundamentalValue(object->id()));
231+
arguments->Insert(0, base::WrapUnique(new base::FundamentalValue(object->id())));
232232
std::unique_ptr<Event> event(new Event(extensions::events::UNKNOWN, "NWObject" + event_name, std::move(arguments)));
233233
event->restrict_to_browser_context = browser_context_;
234234
event->user_gesture = EventRouter::USER_GESTURE_ENABLED;

‎src/api/tray/tray_aura.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ class TrayObserver : public StatusIconObserver {
5151

5252
void OnStatusIconClicked() override {
5353
base::ListValue args;
54-
base::DictionaryValue* data = new base::DictionaryValue;
54+
std::unique_ptr<base::DictionaryValue> data(new base::DictionaryValue);
5555
gfx::Point cursor_pos(
5656
display::Screen::GetScreen()->GetCursorScreenPoint());
5757
data->SetInteger("x", cursor_pos.x());
5858
data->SetInteger("y", cursor_pos.y());
59-
args.Append(data);
59+
args.Append(std::move(data));
6060
tray_->object_manager()->SendEvent(tray_, "TrayClick", args);
6161
}
6262

‎src/browser/nw_extensions_browser_hooks.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void AmendManifestStringList(base::DictionaryValue* manifest,
103103
if (!pattern_list)
104104
pattern_list = new base::ListValue();
105105

106-
pattern_list->Append(new base::StringValue(string_value));
106+
pattern_list->Append(base::WrapUnique(new base::StringValue(string_value)));
107107
if (!amend)
108108
manifest->Set(path, pattern_list);
109109
}
@@ -116,7 +116,7 @@ void AmendManifestList(base::DictionaryValue* manifest,
116116
if (manifest->GetList(path, &pattern_list)) {
117117
base::ListValue::const_iterator it;
118118
for(it = list_value.begin(); it != list_value.end(); ++it) {
119-
pattern_list->Append((*it)->DeepCopy());
119+
pattern_list->Append(base::WrapUnique((*it)->DeepCopy()));
120120
}
121121
} else {
122122
pattern_list = list_value.DeepCopy();
@@ -257,7 +257,7 @@ void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest, std::string* erro
257257
base::ListValue* node_remote_list = NULL;
258258
if (node_remote->GetAsString(&node_remote_string)) {
259259
node_remote_list = new base::ListValue();
260-
node_remote_list->Append(new base::StringValue(node_remote_string));
260+
node_remote_list->Append(base::WrapUnique(new base::StringValue(node_remote_string)));
261261
} else if (node_remote->GetAsList(&node_remote_list)) {
262262
// do nothing
263263
}

‎src/nw_package.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ bool Package::ExtractPackage(const FilePath& zip_file, FilePath* where) {
441441
return false;
442442
}
443443
}else{
444-
*where = scoped_temp_dir_.path();
444+
*where = scoped_temp_dir_.GetPath();
445445
}
446446

447447
return zip::Unzip(zip_file, *where);

‎src/nw_version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#define NW_VERSION_H
2323

2424
#define NW_MAJOR_VERSION 0
25-
#define NW_MINOR_VERSION 18
26-
#define NW_PATCH_VERSION 8
25+
#define NW_MINOR_VERSION 19
26+
#define NW_PATCH_VERSION 0
2727

28-
#define NW_VERSION_IS_RELEASE 1
28+
#define NW_VERSION_IS_RELEASE 0
2929

3030
#ifndef NW_STRINGIFY
3131
#define NW_STRINGIFY(n) NW_STRINGIFY_HELPER(n)
@@ -39,7 +39,7 @@
3939
#else
4040
# define NW_VERSION_STRING NW_STRINGIFY(NW_MAJOR_VERSION) "." \
4141
NW_STRINGIFY(NW_MINOR_VERSION) "." \
42-
NW_STRINGIFY(NW_PATCH_VERSION) "-worker0"
42+
NW_STRINGIFY(NW_PATCH_VERSION) "-beta1"
4343
#endif
4444

4545
#define NW_VERSION "v" NW_VERSION_STRING

0 commit comments

Comments
 (0)