6 www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
View file
@@ -1,4 +1,4 @@
--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
@@ -36,9 +36,9 @@ TaskGroupSampler::TaskGroupSampler(
const OnCpuRefreshCallback& on_cpu_refresh,
@@ -24,7 +24,7 @@
on_process_priority_callback_(on_process_priority) {
DCHECK(blocking_pool_runner.get());

@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t r
@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
on_memory_refresh_callback_);
}

@@ -33,7 +33,7 @@
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t r
@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
on_idle_wakeups_callback_);
}
10 www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
View file
@@ -1,6 +1,6 @@
--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.h
@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::Re
@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::RefCountedThread
using OnCpuRefreshCallback = base::Callback<void(double)>;
using OnMemoryRefreshCallback = base::Callback<void(MemoryUsageStats)>;
using OnIdleWakeupsCallback = base::Callback<void(int)>;
@@ -12,7 +12,7 @@
using OnProcessPriorityCallback = base::Callback<void(bool)>;

TaskGroupSampler(
@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::Re
@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback& on_cpu_refresh,
const OnMemoryRefreshCallback& on_memory_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -24,7 +24,7 @@
const OnProcessPriorityCallback& on_process_priority);

// Refreshes the expensive process' stats (CPU usage, memory usage, and idle
@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::Re
@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::RefCountedThread
double RefreshCpuUsage();
MemoryUsageStats RefreshMemoryUsage();
int RefreshIdleWakeupsPerSecond();
@@ -36,7 +36,7 @@
bool RefreshProcessPriority();

// The process that holds the handle that we own so that we can use it for
@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::Re
@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback on_cpu_refresh_callback_;
const OnMemoryRefreshCallback on_memory_refresh_callback_;
const OnIdleWakeupsCallback on_idle_wakeups_callback_;
4 www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(Tas
@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
}

int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
4 www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/tracing/crash_service_uploader.cc
@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUpload
@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
const char product[] = "Chrome_Android";
#elif defined(OS_CHROMEOS)
const char product[] = "Chrome_ChromeOS";
4 www/chromium/files/patch-chrome_browser_ui_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/BUILD.gn.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/BUILD.gn.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/BUILD.gn
@@ -3135,7 +3135,7 @@ split_static_library("ui") {
@@ -3170,7 +3170,7 @@ split_static_library("ui") {
]
}
}
12 www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
View file
@@ -1,4 +1,4 @@
--- chrome/browser/ui/browser_command_controller.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/browser_command_controller.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -80,7 +80,7 @@
#include "chrome/browser/ui/browser_commands_chromeos.h"
@@ -9,16 +9,16 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif

@@ -190,7 +190,7 @@ bool BrowserCommandController::IsReserve
if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
return true;
@@ -209,7 +209,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}

-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
@@ -395,7 +395,7 @@ void BrowserCommandController::ExecuteCo
@@ -413,7 +413,7 @@ void BrowserCommandController::ExecuteCommandWithDispo
break;
#endif

@@ -27,7 +27,7 @@
case IDC_USE_SYSTEM_TITLE_BAR: {
PrefService* prefs = profile()->GetPrefs();
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
@@ -755,7 +755,7 @@ void BrowserCommandController::InitComma
@@ -766,7 +766,7 @@ void BrowserCommandController::InitCommandState() {
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
#endif
4 www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/input_method/input_method_engine.h
@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMe
@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase

// ui::IMEEngineHandlerInterface:
bool IsActive() const override;
4 www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser
@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
// This flag gives extensions more powers.
extensions::switches::kExtensionsOnChromeURLs,

9 www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -96,7 +96,7 @@
@@ -94,7 +94,7 @@
#include "components/user_manager/user_manager.h"
#endif

@@ -9,15 +9,14 @@
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif

@@ -668,9 +668,11 @@ bool StartupBrowserCreator::ProcessCmdLi
@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
}
#endif // OS_CHROMEOS

+#if 0 /* XXX */
#if defined(TOOLKIT_VIEWS) && defined(USE_X11)
ui::TouchFactory::SetTouchDeviceListFromCommandLine();
#endif
+#endif
#endif

#if defined(OS_MACOSX)
if (web_app::MaybeRebuildShortcut(command_line))
6 www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
View file
@@ -1,11 +1,11 @@
--- chrome/browser/ui/tab_helpers.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/tab_helpers.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -245,7 +245,7 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -258,7 +258,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif

#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents);
#endif
// --- Feature tab helpers behind flags ---

10 www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::Ge
@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
? stringifier_->backgrounded_string()
: stringifier_->foregrounded_string();

@@ -16,7 +16,7 @@

case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: {
return stringifier_->GetMemoryStateText(
@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues
@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1,
return BooleanCompare(is_proc1_bg, is_proc2_bg);
}

@@ -25,7 +25,7 @@
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int proc1_fd_count =
observed_task_manager()->GetOpenFdCount(tasks_[row1]);
@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues
@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues(int row1,
observed_task_manager()->GetOpenFdCount(tasks_[row2]);
return ValueCompare(proc1_fd_count, proc2_fd_count);
}
@@ -34,7 +34,7 @@

default:
NOTREACHED();
@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefres
@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
type = REFRESH_TYPE_KEEPALIVE_COUNT;
break;

4 www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -631,7 +631,7 @@ bool AppMenuModel::IsCommandIdVisible(in
@@ -619,7 +619,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
case IDC_UPGRADE_DIALOG:
return browser_defaults::kShowUpgradeMenuItem &&
UpgradeDetector::GetInstance()->notify_upgrade();
8 www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/accelerator_table.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/accelerator_table.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap
@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE },
{ ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB },
{ ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB },
@@ -9,7 +9,7 @@
{ ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
{ ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
{ ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT },
@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap
@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_NUMPAD7, kPlatformModifier, IDC_SELECT_TAB_6 },
{ ui::VKEY_8, kPlatformModifier, IDC_SELECT_TAB_7 },
{ ui::VKEY_NUMPAD8, kPlatformModifier, IDC_SELECT_TAB_7 },
@@ -18,7 +18,7 @@
{ ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
{ ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
{ ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 },
@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap
@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#endif // !OS_MACOSX

// Platform-specific key maps.
4 ...mium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
View file
@@ -1,4 +1,4 @@
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -19,7 +19,7 @@
#include "ui/gfx/image/image_skia.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/shell_integration_linux.h"
#endif

@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB
@@ -56,7 +56,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
const AppWindow::CreateParams& create_params,
views::Widget::InitParams* init_params,
views::Widget* widget) {
19 ...hromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
View file
@@ -1,23 +1,24 @@
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -26,14 +26,14 @@
@@ -29,7 +29,7 @@
#include "ui/wm/core/wm_state.h"
#endif // defined(USE_AURA)

-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
#include "base/command_line.h"
#include "chrome/browser/ui/simple_message_box.h"
#include "chrome/grit/chromium_strings.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -40,7 +40,7 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/common/content_switches.h"
#include "ui/base/l10n/l10n_util.h"
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)

ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
}
@@ -70,7 +70,7 @@ void ChromeBrowserMainExtraPartsViews::P
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/ash_config.h"
@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
IMEDriver::Register();
#endif

@@ -26,7 +27,7 @@
// On the Linux desktop, we want to prevent the user from logging in as root,
// so that we don't destroy the profile. Now that we have some minimal ui
// initialized, check to see if we're running as root and bail if we are.
@@ -94,7 +94,7 @@ void ChromeBrowserMainExtraPartsViews::P
@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
base::RunLoop().RunUntilIdle();

exit(EXIT_FAILURE);
4 www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views
@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
HICON GetSmallWindowIcon() const override;
int GetAppbarAutohideEdges(HMONITOR monitor,
const base::Closure& callback) override;
6 www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
View file
@@ -1,17 +1,17 @@
--- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/first_run_dialog.cc
@@ -40,8 +40,10 @@ using views::GridLayout;
namespace {

void InitCrashReporterIfEnabled(bool enabled) {
+#ifndef OS_BSD
+#if !defined(OS_BSD)
if (enabled)
breakpad::InitCrashReporter(std::string());
+#endif
}

} // namespace
@@ -121,8 +123,10 @@ views::View* FirstRunDialog::CreateExtra
@@ -120,8 +122,10 @@ views::View* FirstRunDialog::CreateExtraView() {
bool FirstRunDialog::Accept() {
GetWidget()->Hide();

4 www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
View file
@@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -38,7 +38,7 @@
#include "ui/views/window/frame_background.h"
@@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif

@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPress
@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
const gfx::Point& point,
const ui::Event* event) {
4 ...s/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci
@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy
return false;
}

6 www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystem
@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
}
@@ -9,7 +9,7 @@
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
IDS_SHOW_WINDOW_DECORATIONS_MENU);
@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystem
@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
}
4 www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
View file
@@ -1,4 +1,4 @@
--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
@@ -13,7 +13,7 @@
#include "components/sessions/core/tab_restore_service.h"
@@ -9,7 +9,7 @@
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#endif
@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuMode
@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {
}

bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
8 www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -251,7 +251,7 @@ void TabDragController::Init(
@@ -249,7 +249,7 @@ void TabDragController::Init(
// synchronous on desktop Linux, so use that.
// - Ash
// Releasing capture on Ash cancels gestures so avoid it.
@@ -9,7 +9,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
@@ -597,7 +597,7 @@ TabDragController::DragBrowserToNewTabSt
@@ -594,7 +594,7 @@ TabDragController::DragBrowserToNewTabStrip(
else
target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);

@@ -18,7 +18,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
@@ -1787,7 +1787,7 @@ TabDragController::Liveness TabDragContr
@@ -1784,7 +1784,7 @@ TabDragController::Liveness TabDragController::GetLoca
if (dragged_window)
exclude.insert(dragged_window);
}
4 www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/tabs/tab_strip.cc
@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab
@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views:
tab_strip_(tab_strip),
destroyed_(NULL) {
set_animate_on_state_change(true);
97 www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
View file
@@ -1,15 +1,41 @@
--- chrome/browser/ui/webui/about_ui.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/webui/about_ui.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/about_ui.cc
@@ -76,7 +76,7 @@
#include "chrome/browser/ui/webui/theme_source.h"
#endif
@@ -420,7 +420,7 @@ std::string ChromeURLs() {
return html;
}

-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "content/public/browser/zygote_host_linux.h"
#include "content/public/common/sandbox_linux.h"
#endif
@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)

const char kAboutDiscardsRunCommand[] = "run";

@@ -539,7 +539,7 @@ std::string AboutDiscards(const std::string& path) {
output.append(base::StringPrintf("<a href='%s%s'>Discard tab now</a>",
chrome::kChromeUIDiscardsURL,
kAboutDiscardsRunCommand));
-
+#if !defined(OS_BSD)
base::SystemMemoryInfoKB meminfo;
base::GetSystemMemoryInfo(&meminfo);
output.append("<h3>System memory information in MB</h3>");
@@ -551,6 +551,7 @@ std::string AboutDiscards(const std::string& path) {
"Free",
base::IntToString(base::SysInfo::AmountOfAvailablePhysicalMemory() /
1024 / 1024)));
+#endif
#if defined(OS_CHROMEOS)
int mem_allocated_kb = meminfo.active_anon + meminfo.inactive_anon;
#if defined(ARCH_CPU_ARM_FAMILY)
@@ -580,7 +581,7 @@ std::string AboutDiscards(const std::string& path) {
return output;
}

-#endif // OS_WIN || OS_MACOSX || OS_LINUX
+#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)

// AboutDnsHandler bounces the request back to the IO thread to collect
// the DNS information.
@@ -642,7 +643,7 @@ class AboutDnsHandler : public base::RefCountedThreadS
DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler);
};

@@ -18,39 +44,15 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() {
return data;
}

+#if !defined(OS_BSD)
void AboutSandboxRow(std::string* data, int name_id, bool good) {
data->append("<tr><td>");
data->append(l10n_util::GetStringUTF8(name_id));
@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data,
}
data->append("</td></tr>");
}
+#endif

std::string AboutSandbox() {
std::string data;
@@ -683,6 +685,7 @@ std::string AboutSandbox() {
data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
data.append("</h1>");

+#if !defined(OS_BSD)
// Get expected sandboxing status of renderers.
const int status =
content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
@@ -723,6 +726,7 @@ std::string AboutSandbox() {
data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));
}
data.append("</p>");
+#endif

AppendFooter(&data);
return data;
@@ -794,7 +798,7 @@ void AboutUIHTMLSource::StartDataRequest
@@ -717,14 +718,14 @@ void AboutUIHTMLSource::StartDataRequest(
} else {
response = raw_response.as_string();
}
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
} else if (source_name_ == chrome::kChromeUIDiscardsHost) {
response = AboutDiscards(path);
#endif
} else if (source_name_ == chrome::kChromeUIDNSHost) {
AboutDnsHandler::Start(profile(), callback);
return;
@@ -59,12 +61,3 @@
} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
#endif
@@ -803,7 +807,7 @@ void AboutUIHTMLSource::StartDataRequest
ChromeOSCreditsHandler::Start(path, callback);
return;
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
} else if (source_name_ == chrome::kChromeUISandboxHost) {
response = AboutSandbox();
#endif
17 www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
View file
@@ -1,15 +1,22 @@
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-05-02 19:02:48 UTC
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -290,7 +290,7 @@ bool IsAboutUI(const GURL& url) {
@@ -292,13 +292,13 @@ bool IsAboutUI(const GURL& url) {
#if !defined(OS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost ||
url.host_piece() == chrome::kChromeUISandboxHost
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
@@ -567,7 +567,7 @@ WebUIFactoryFunction GetWebUIFactoryFunc
#if defined(OS_CHROMEOS)
|| url.host_piece() == chrome::kChromeUIOSCreditsHost
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
|| url.host_piece() == chrome::kChromeUIDiscardsHost
#endif
); // NOLINT
@@ -568,7 +568,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
26 www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
View file
@@ -1,22 +1,22 @@
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -608,13 +608,13 @@ void BrowserOptionsHandler::GetLocalized
{ "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
@@ -592,13 +592,13 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
{"syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL},
#endif // defined(OS_CHROMEOS)

-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
{ "themesNativeButton", IDS_THEMES_GTK_BUTTON },
{ "themesSetClassic", IDS_THEMES_SET_CLASSIC },
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
{"themesNativeButton", IDS_THEMES_GTK_BUTTON},
{"themesSetClassic", IDS_THEMES_SET_CLASSIC},
#else
{ "themes", IDS_THEMES_GROUP_NAME },
{"themes", IDS_THEMES_GROUP_NAME},
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // defined(OS_POSIX) && !defined(OS_CHROMEOS)

#if defined(OS_CHROMEOS) && defined(USE_ASH)
{ "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
@@ -859,7 +859,7 @@ void BrowserOptionsHandler::RegisterMess
#if defined(OS_CHROMEOS)
{"setWallpaper", IDS_SET_WALLPAPER_BUTTON},
@@ -845,7 +845,7 @@ void BrowserOptionsHandler::RegisterMessages() {
"requestProfilesInfo",
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
base::Unretained(this)));
@@ -25,7 +25,7 @@
web_ui()->RegisterMessageCallback(
"themesSetNative",
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
@@ -1519,7 +1519,7 @@ void BrowserOptionsHandler::ObserveTheme
@@ -1505,7 +1505,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_system_theme = false;

@@ -34,12 +34,12 @@
bool profile_is_supervised = profile->IsSupervised();
is_system_theme = theme_service->UsingSystemTheme();
base::Value native_theme_enabled(!is_system_theme && !profile_is_supervised);
@@ -1540,7 +1540,7 @@ void BrowserOptionsHandler::ThemesReset(
@@ -1526,7 +1526,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
}

-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
base::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
Profile* profile = Profile::FromWebUI(web_ui());
4 www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/options/browser_options_handler.h
@@ -210,7 +210,7 @@ class BrowserOptionsHandler
@@ -215,7 +215,7 @@ class BrowserOptionsHandler

void ObserveThemeChanged();
void ThemesReset(const base::ListValue* args);
6 www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/settings/appearance_handler.cc
@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages
@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages() {
"useDefaultTheme",
base::Bind(&AppearanceHandler::HandleUseDefaultTheme,
base::Unretained(this)));
@@ -9,7 +9,7 @@
web_ui()->RegisterMessageCallback(
"useSystemTheme",
base::Bind(&AppearanceHandler::HandleUseSystemTheme,
@@ -50,7 +50,7 @@ void AppearanceHandler::HandleUseDefault
@@ -50,7 +50,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
}

4 www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
View file
@@ -1,6 +1,6 @@
--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/settings/appearance_handler.h
@@ -35,7 +35,7 @@ class AppearanceHandler : public Setting
@@ -35,7 +35,7 @@ class AppearanceHandler : public SettingsPageUIHandler
// Changes the UI theme of the browser to the default theme.
void HandleUseDefaultTheme(const base::ListValue* args);

12 ...iles/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
View file
@@ -1,20 +1,20 @@
--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -301,7 +301,7 @@ void AddAppearanceStrings(content::WebUI
{"appearancePageTitle", IDS_SETTINGS_APPEARANCE},
{"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM},
@@ -332,7 +332,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
{"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
{"themes", IDS_SETTINGS_THEMES},
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
@@ -321,7 +321,7 @@ void AddAppearanceStrings(content::WebUI
@@ -350,7 +350,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
{"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
};
#if defined(OS_MACOSX)
4 www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
View file
@@ -1,4 +1,4 @@
--- chrome/browser/web_applications/web_app.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/web_applications/web_app.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/web_applications/web_app.cc
@@ -58,7 +58,7 @@ namespace {
#if defined(OS_MACOSX)
@@ -9,7 +9,7 @@
// Linux supports icons of any size. FreeDesktop Icon Theme Specification states
// that "Minimally you should install a 48x48 icon in the hicolor theme."
const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationIn
@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info,
}
#endif

4 www/chromium/files/patch-chrome_browser_web__applications_web__app.h
View file
@@ -1,6 +1,6 @@
--- chrome/browser/web_applications/web_app.h.orig 2017-04-19 19:06:30 UTC
--- chrome/browser/web_applications/web_app.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/web_applications/web_app.h
@@ -208,7 +208,7 @@ typedef std::vector<WebApplicationInfo::
@@ -206,7 +206,7 @@ typedef std::vector<WebApplicationInfo::IconInfo> Icon
void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
#endif

6 www/chromium/files/patch-chrome_chrome__paks.gni
View file
@@ -1,11 +1,11 @@
--- chrome/chrome_paks.gni.orig 2017-05-09 19:02:43 UTC
--- chrome/chrome_paks.gni.orig 2017-06-05 19:03:03 UTC
+++ chrome/chrome_paks.gni
@@ -157,7 +157,7 @@ template("chrome_extra_paks") {
"//ui/file_manager:resources",
]
}
- if (is_linux) {
+ if (is_linux || is_bsd) {
- if (is_linux || is_mac) {
+ if (is_linux || is_bsd || is_mac) {
sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ]
deps += [ "//headless:resources" ]
}
58 www/chromium/files/patch-chrome_common_chrome__paths.cc
View file
@@ -1,6 +1,23 @@
--- chrome/common/chrome_paths.cc.orig 2017-04-19 19:06:30 UTC
+++ chrome/common/chrome_paths.cc
@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat
--- chrome/common/chrome_paths.cc.orig 2017-06-15 21:03:02.000000000 +0200
+++ chrome/common/chrome_paths.cc 2017-06-18 01:09:20.663411000 +0200
@@ -51,14 +51,14 @@
const base::FilePath::CharType kInternalNaClPluginFileName[] =
FILE_PATH_LITERAL("internal-nacl-plugin");

-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// The path to the external extension <id>.json files.
// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
#if defined(GOOGLE_CHROME_BUILD)
FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
#else
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
#endif // defined(GOOGLE_CHROME_BUILD)

// The path to the hint file that tells the pepper plugin loader
@@ -190,7 +190,7 @@
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -9,7 +26,16 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
@@ -474,10 +474,12 @@ bool PathProvider(int key, base::FilePat
@@ -426,7 +426,7 @@
break;
#endif
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur))
return false;
@@ -474,10 +474,12 @@
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -23,7 +49,25 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
@@ -528,7 +530,7 @@ bool PathProvider(int key, base::FilePat
@@ -485,7 +487,7 @@
}
#endif
#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
- defined(OS_MACOSX)
+ defined(OS_MACOSX) || defined(OS_BSD)
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
@@ -493,7 +495,7 @@
break;
}
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
@@ -528,7 +530,7 @@
#endif
break;

@@ -32,7 +76,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
@@ -542,6 +544,9 @@ bool PathProvider(int key, base::FilePat
@@ -542,6 +544,9 @@
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
@@ -42,7 +86,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
@@ -554,7 +559,7 @@ bool PathProvider(int key, base::FilePat
@@ -554,7 +559,7 @@
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
4 www/chromium/files/patch-chrome_common_chrome__paths__internal.h
View file
@@ -1,6 +1,6 @@
--- chrome/common/chrome_paths_internal.h.orig 2017-04-19 19:06:30 UTC
--- chrome/common/chrome_paths_internal.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/chrome_paths_internal.h
@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::F
@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);

4 www/chromium/files/patch-chrome_common_chrome__switches.cc
View file
@@ -1,6 +1,6 @@
--- chrome/common/chrome_switches.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/common/chrome_switches.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/chrome_switches.cc
@@ -1138,7 +1138,7 @@ const char kAllowNaClSocketAPI[]
@@ -1144,7 +1144,7 @@ const char kAllowNaClSocketAPI[] = "allow-n
const char kEnableWaylandServer[] = "enable-wayland-server";
#endif
4 www/chromium/files/patch-chrome_common_chrome__switches.h
View file
@@ -1,6 +1,6 @@
--- chrome/common/chrome_switches.h.orig 2017-04-19 19:06:30 UTC
--- chrome/common/chrome_switches.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/chrome_switches.h
@@ -351,7 +351,7 @@ extern const char kAllowNaClSocketAPI[];
@@ -352,7 +352,7 @@ extern const char kAllowNaClSocketAPI[];
extern const char kEnableWaylandServer[];
#endif

4 www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- chrome/common/extensions/api/BUILD.gn.orig 2017-05-02 19:02:48 UTC
--- chrome/common/extensions/api/BUILD.gn.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/extensions/api/BUILD.gn
@@ -116,7 +116,7 @@ if (is_chromeos) {
@@ -121,7 +121,7 @@ if (is_chromeos) {
"wallpaper.json",
"wallpaper_private.json",
]
6 www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
View file
@@ -1,7 +1,7 @@
--- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/extensions/chrome_extensions_client.cc
@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChann
static base::LazyInstance<ChromeExtensionsClient> g_client =
@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChannelForHistogram
static base::LazyInstance<ChromeExtensionsClient>::DestructorAtExit g_client =
LAZY_INSTANCE_INITIALIZER;

-ChromeExtensionsClient::ChromeExtensionsClient() {}
4 www/chromium/files/patch-chrome_common_extensions_command.cc
View file
@@ -1,6 +1,6 @@
--- chrome/common/extensions/command.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/common/extensions/command.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/extensions/command.cc
@@ -302,7 +302,7 @@ std::string Command::CommandPlatform() {
@@ -303,7 +303,7 @@ std::string Command::CommandPlatform() {
return values::kKeybindingPlatformMac;
#elif defined(OS_CHROMEOS)
return values::kKeybindingPlatformChromeOs;
6 www/chromium/files/patch-chrome_common_features.gni
View file
@@ -1,7 +1,7 @@
--- chrome/common/features.gni.orig 2017-04-19 19:06:30 UTC
--- chrome/common/features.gni.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/features.gni
@@ -40,7 +40,7 @@ declare_args() {
enable_hotwording = is_chrome_branded && is_chromeos
@@ -47,7 +47,7 @@ declare_args() {
is_android || is_mac || (is_desktop_linux && use_glib && use_gio)

enable_one_click_signin =
- is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
8 www/chromium/files/patch-chrome_common_pref__names.cc
View file
@@ -1,6 +1,6 @@
--- chrome/common/pref_names.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/common/pref_names.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/pref_names.cc
@@ -1013,7 +1013,7 @@ const char kForceSessionSync[] = "settin
@@ -1009,7 +1009,7 @@ const char kForceSessionSync[] = "settings.history_rec
// only using an account that belongs to one of the domains from this pref.
const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
@@ -1100,7 +1100,7 @@ const char kShowUpdatePromotionInfoBar[]
@@ -1096,7 +1096,7 @@ const char kShowUpdatePromotionInfoBar[] =
"browser.show_update_promotion_info_bar";
#endif
@@ -18,7 +18,7 @@
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
@@ -1476,7 +1476,7 @@ const char kDownloadDefaultDirectory[] =
@@ -1475,7 +1475,7 @@ const char kDownloadDefaultDirectory[] = "download.def
// upgrade a unsafe location to a safe location.
const char kDownloadDirUpgraded[] = "download.directory_upgrade";

8 www/chromium/files/patch-chrome_common_pref__names.h
View file
@@ -1,6 +1,6 @@
--- chrome/common/pref_names.h.orig 2017-04-19 19:06:30 UTC
--- chrome/common/pref_names.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/pref_names.h
@@ -340,7 +340,7 @@ extern const char kForceGoogleSafeSearch
@@ -337,7 +337,7 @@ extern const char kForceGoogleSafeSearch[];
extern const char kForceYouTubeRestrict[];
extern const char kForceSessionSync[];
extern const char kAllowedDomainsForApps[];
@@ -9,7 +9,7 @@
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
@@ -373,7 +373,7 @@ extern const char kDefaultBrowserSetting
@@ -370,7 +370,7 @@ extern const char kDefaultBrowserSettingEnabled[];
#if defined(OS_MACOSX)
extern const char kShowUpdatePromotionInfoBar[];
#endif
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
extern const char kBackShortcutBubbleShownCount[];
@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[];
@@ -529,7 +529,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[];
15 www/chromium/files/patch-chrome_common_url__constants.cc
View file
@@ -1,6 +1,6 @@
--- chrome/common/url_constants.cc.orig 2017-04-19 19:06:30 UTC
--- chrome/common/url_constants.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/url_constants.cc
@@ -143,7 +143,7 @@ const char kChromeUIMdCupsSettingsURL[]
@@ -145,7 +145,7 @@ const char kChromeUICleanupToolURL[] = "chrome://clean
const char kChromeUIMetroFlowURL[] = "chrome://make-metro/";
#endif

@@ -9,7 +9,16 @@
const char kChromeUITabModalConfirmDialogURL[] =
"chrome://tab-modal-confirm-dialog/";
#endif
@@ -337,7 +337,7 @@ const char kChromeOSAssetPath[] = "/usr/
@@ -161,7 +161,7 @@ const char kChromeUICastURL[] = "chrome://cast/";
#endif
#endif

-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
@@ -340,7 +340,7 @@ const char kChromeUICleanupToolHost[] = "cleanup";
const char kChromeUIMetroFlowHost[] = "make-metro";
#endif

15 www/chromium/files/patch-chrome_common_url__constants.h
View file
@@ -1,6 +1,6 @@
--- chrome/common/url_constants.h.orig 2017-04-19 19:06:30 UTC
--- chrome/common/url_constants.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/common/url_constants.h
@@ -128,7 +128,7 @@ extern const char kChromeUIMdCupsSetting
@@ -131,7 +131,7 @@ extern const char kChromeUICleanupToolURL[];
extern const char kChromeUIMetroFlowURL[];
#endif

@@ -9,7 +9,16 @@
extern const char kChromeUITabModalConfirmDialogURL[];
#endif

@@ -314,7 +314,7 @@ extern const char kChromeOSAssetPath[];
@@ -146,7 +146,7 @@ extern const char kChromeUICastURL[];
#endif
#endif

-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
extern const char kChromeUIDiscardsHost[];
extern const char kChromeUIDiscardsURL[];
#endif
@@ -318,7 +318,7 @@ extern const char kChromeUICleanupToolHost[];
extern const char kChromeUIMetroFlowHost[];
#endif

8 www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
View file
@@ -1,4 +1,4 @@
--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-04-19 19:06:31 UTC
--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
@@ -14,7 +14,7 @@
#include "ppapi/proxy/ppapi_messages.h"
@@ -9,7 +9,7 @@
#include "content/public/child/child_process_sandbox_support_linux.h"
#include "content/public/common/common_sandbox_support_linux.h"
#elif defined(OS_WIN)
@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFont
@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost(
const ppapi::proxy::SerializedFontDescription& description,
PP_PrivateFontCharset charset)
: ResourceHost(host->GetPpapiHost(), instance, resource) {
@@ -18,7 +18,7 @@
fd_.reset(content::MatchFontWithFallback(
description.face,
description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFont
@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost(
sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
typeface_ = sk_sp<SkTypeface>(
font_mgr->matchFamilyStyle(description.face.c_str(), style));
@@ -27,7 +27,7 @@
}

PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontDat
@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab
void* buffer,
size_t* length) {
bool result = false;
4 www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
View file
@@ -1,4 +1,4 @@
--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-04-19 19:06:31 UTC
--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-06-05 19:03:03 UTC
+++ chrome/renderer/pepper/pepper_flash_font_file_host.h
@@ -14,7 +14,7 @@
#include "ppapi/c/private/pp_private_font_charset.h"
@@ -9,7 +9,7 @@
#include "base/files/scoped_file.h"
#elif defined(OS_WIN)
#include "third_party/skia/include/core/SkRefCnt.h"
@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p
@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re
uint32_t table);
bool GetFontData(uint32_t table, void* buffer, size_t* length);

36 www/chromium/files/patch-chrome_test_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- chrome/test/BUILD.gn.orig 2017-04-19 19:06:31 UTC
--- chrome/test/BUILD.gn.orig 2017-06-05 19:03:04 UTC
+++ chrome/test/BUILD.gn
@@ -190,7 +190,7 @@ static_library("test_support") {
@@ -192,7 +192,7 @@ static_library("test_support") {
]
}

@@ -9,7 +9,7 @@
public_deps += [ "//crypto:platform" ]
}
if (is_mac) {
@@ -455,7 +455,7 @@ if (!is_android) {
@@ -454,7 +454,7 @@ if (!is_android) {
"$root_out_dir/test_page.css.mock-http-headers",
"$root_out_dir/ui_test.pak",
]
@@ -18,7 +18,7 @@
data += [
"$root_out_dir/chrome_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
@@ -464,7 +464,7 @@ if (!is_android) {
@@ -463,7 +463,7 @@ if (!is_android) {
"$root_out_dir/resources.pak",
]
}
@@ -27,16 +27,16 @@
data += [ "$root_out_dir/libppapi_tests.so" ]
}

@@ -584,7 +584,7 @@ if (!is_android) {
"../browser/ui/views/payments/payment_sheet_view_controller_interactive_uitest.cc",
@@ -570,7 +570,7 @@ if (!is_android) {
"base/interactive_test_utils_views.cc",
]
}
- if (is_linux) {
+ if (is_linux || is_bsd) {
if (!is_chromeos) {
# Desktop linux.
sources -= [
@@ -2048,14 +2048,14 @@ test("browser_tests") {
@@ -2044,14 +2044,14 @@ test("browser_tests") {
sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
deps += [ "//chrome/browser/chromeos" ]
data_deps += [ "//third_party/liblouis:liblouis_test_data" ]
@@ -53,7 +53,7 @@
sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
}
@@ -2067,7 +2067,7 @@ test("browser_tests") {
@@ -2063,7 +2063,7 @@ test("browser_tests") {
configs +=
[ "//build/config/win:default_large_module_incremental_linking" ]
}
@@ -62,7 +62,7 @@
data_deps += [ "//components/nacl/loader:nacl_helper" ]

if (enable_nacl_nonsfi) {
@@ -2186,7 +2186,7 @@ test("browser_tests") {
@@ -2200,7 +2200,7 @@ test("browser_tests") {
}
}

@@ -71,7 +71,7 @@
# Set rpath to find the CDM adapter even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
@@ -2412,7 +2412,7 @@ test("browser_tests") {
@@ -2430,7 +2430,7 @@ test("browser_tests") {
if (toolkit_views) {
sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
}
@@ -80,7 +80,7 @@
sources +=
[ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
}
@@ -2594,7 +2594,7 @@ test("browser_tests") {
@@ -2620,7 +2620,7 @@ test("browser_tests") {
"../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
]
}
@@ -89,7 +89,7 @@
sources += [
# Tests for non mobile and non CrOS (includes Linux, Win, Mac).
"../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
@@ -2772,7 +2772,7 @@ if (!is_android) {
@@ -2802,7 +2802,7 @@ if (!is_android) {
"//testing/xvfb.py",
]

@@ -98,7 +98,7 @@
data += [
"$root_out_dir/chrome_100_percent.pak",
"$root_out_dir/chrome_200_percent.pak",
@@ -3471,7 +3471,7 @@ test("unit_tests") {
@@ -3504,7 +3504,7 @@ test("unit_tests") {
"$root_out_dir/resources.pak",
]
}
@@ -107,7 +107,7 @@
data += [ "$root_out_dir/chrome_200_percent.pak" ]
}
if (is_win) {
@@ -4198,7 +4198,7 @@ test("unit_tests") {
@@ -4234,7 +4234,7 @@ test("unit_tests") {
"//ui/wm",
]
}
@@ -116,7 +116,7 @@
sources += [
"../browser/password_manager/native_backend_kwallet_x_unittest.cc",
"../browser/shell_integration_linux_unittest.cc",
@@ -4218,7 +4218,7 @@ test("unit_tests") {
@@ -4256,7 +4256,7 @@ test("unit_tests") {
if (use_gio) {
deps += [ "//build/linux/libgio" ]
}
@@ -125,7 +125,7 @@
deps += [ "//chrome/browser/ui/libgtkui" ]
}

@@ -4487,18 +4487,18 @@ test("unit_tests") {
@@ -4537,18 +4537,18 @@ test("unit_tests") {
"//components/os_crypt:gnome_keyring_direct",
]
}
@@ -147,7 +147,7 @@
ldflags = [ "-Wl,--strip-debug" ]
}
if (is_mac) {
@@ -4996,7 +4996,7 @@ if (safe_browsing_mode == 1 && is_mac) {
@@ -5045,7 +5045,7 @@ if (safe_browsing_mode == 1 && is_mac) {
}
}

@@ -156,7 +156,7 @@
# TODO(609855): Make this compile on Android and run on the bots.
test("chrome_app_unittests") {
sources = [
@@ -5021,7 +5021,7 @@ if (!is_android) {
@@ -5071,7 +5071,7 @@ if (!is_android) {
}
}

4 www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
View file
@@ -1,6 +1,6 @@
--- chrome/test/base/in_process_browser_test.cc.orig 2017-04-19 19:06:31 UTC
--- chrome/test/base/in_process_browser_test.cc.orig 2017-06-05 19:03:04 UTC
+++ chrome/test/base/in_process_browser_test.cc
@@ -94,6 +94,10 @@
@@ -95,6 +95,10 @@

namespace {

4 www/chromium/files/patch-chrome_test_base_testing__browser__process.h
View file
@@ -1,6 +1,6 @@
--- chrome/test/base/testing_browser_process.h.orig 2017-04-19 19:06:31 UTC
--- chrome/test/base/testing_browser_process.h.orig 2017-06-05 19:03:04 UTC
+++ chrome/test/base/testing_browser_process.h
@@ -108,8 +108,8 @@ class TestingBrowserProcess : public Bro
@@ -108,8 +108,8 @@ class TestingBrowserProcess : public BrowserProcess {
DownloadStatusUpdater* download_status_updater() override;
DownloadRequestLimiter* download_request_limiter() override;

6 www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
View file
@@ -1,6 +1,6 @@
--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-04-19 19:06:31 UTC
--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-06-05 19:03:04 UTC
+++ chrome/test/chromedriver/chrome/chrome_finder.cc
@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base
@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
installation_locations[i].Append(L"Chromium\\Application"));
}
}
@@ -9,7 +9,7 @@
void GetApplicationDirs(std::vector<base::FilePath>* locations) {
locations->push_back(base::FilePath("/opt/google/chrome"));
locations->push_back(base::FilePath("/usr/local/bin"));
@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_
@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_exe) {
#elif defined(OS_MACOSX)
base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
base::FilePath("Chromium.app/Contents/MacOS/Chromium")
19 www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
View file
@@ -1,4 +1,4 @@
--- chromecast/browser/cast_browser_main_parts.cc.orig 2017-04-19 19:06:32 UTC
--- chromecast/browser/cast_browser_main_parts.cc.orig 2017-06-05 19:03:05 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
@@ -70,7 +70,7 @@
#include <signal.h>
@@ -9,16 +9,25 @@
#include <fontconfig/fontconfig.h>
#endif

@@ -229,7 +229,7 @@ DefaultCommandLineSwitch g_default_switc
#if BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -233,7 +233,7 @@ DefaultCommandLineSwitch g_default_switches[] = {
{ switches::kDisableGpu, "" },
#endif
#endif // defined(OS_ANDROID)
#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#if defined(ARCH_CPU_X86_FAMILY)
// This is needed for now to enable the x11 Ozone platform to work with
// current Linux/NVidia OpenGL drivers.
@@ -371,7 +371,7 @@ void CastBrowserMainParts::PostMainMessa
@@ -243,7 +243,7 @@ DefaultCommandLineSwitch g_default_switches[] = {
{switches::kEnableHardwareOverlays, "cast"},
#endif
#endif
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
// Needed so that our call to GpuDataManager::SetGLStrings doesn't race
// against GPU process creation (which is otherwise triggered from
// BrowserThreadsStarted). The GPU process will be created as soon as a
@@ -378,7 +378,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart()
}

void CastBrowserMainParts::ToolkitInitialized() {
4 www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
View file
@@ -1,6 +1,6 @@
--- chromecast/browser/cast_content_browser_client.cc.orig 2017-04-19 19:06:32 UTC
--- chromecast/browser/cast_content_browser_client.cc.orig 2017-06-05 19:03:05 UTC
+++ chromecast/browser/cast_content_browser_client.cc
@@ -298,7 +298,7 @@ void CastContentBrowserClient::AppendExt
@@ -316,7 +316,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback);
}

4 www/chromium/files/patch-chromecast_crash_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- chromecast/crash/BUILD.gn.orig 2017-04-19 19:06:32 UTC
--- chromecast/crash/BUILD.gn.orig 2017-06-05 19:03:05 UTC
+++ chromecast/crash/BUILD.gn
@@ -78,7 +78,7 @@ source_set("test_support") {
@@ -79,7 +79,7 @@ source_set("test_support") {
]
}

4 www/chromium/files/patch-components_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- components/BUILD.gn.orig 2017-04-19 19:06:32 UTC
--- components/BUILD.gn.orig 2017-06-05 19:03:05 UTC
+++ components/BUILD.gn
@@ -177,8 +177,8 @@ test("components_unittests") {
@@ -179,8 +179,8 @@ test("components_unittests") {
"//components/certificate_reporting:unit_tests",
"//components/certificate_transparency:unit_tests",
"//components/contextual_search:unit_tests",
4 ...ium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
View file
@@ -1,6 +1,6 @@
--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-04-19 19:06:32 UTC
--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-06-05 19:03:05 UTC
+++ components/autofill/content/renderer/password_form_conversion_utils.cc
@@ -28,7 +28,11 @@
@@ -29,7 +29,11 @@
#include "third_party/WebKit/public/web/WebFormControlElement.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebInputElement.h"
4 www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
View file
@@ -1,6 +1,6 @@
--- components/autofill/core/browser/autofill_experiments.cc.orig 2017-04-19 19:06:32 UTC
--- components/autofill/core/browser/autofill_experiments.cc.orig 2017-06-05 19:03:05 UTC
+++ components/autofill/core/browser/autofill_experiments.cc
@@ -151,7 +151,7 @@ unsigned int GetPopupMargin() {
@@ -153,7 +153,7 @@ unsigned int GetPopupMargin() {
}

bool OfferStoreUnmaskedCards() {
4 ...mium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
View file
@@ -1,6 +1,6 @@
--- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-04-19 19:06:32 UTC
--- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-06-05 19:03:05 UTC
+++ components/content_settings/core/browser/website_settings_registry.cc
@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin
@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
// doesn't allow the settings to be managed in the same way. See
// crbug.com/642184.
sync_status = WebsiteSettingsInfo::UNSYNCABLE;
4 www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
View file
@@ -1,4 +1,4 @@
--- components/cookie_config/cookie_store_util.cc.orig 2017-04-19 19:06:32 UTC
--- components/cookie_config/cookie_store_util.cc.orig 2017-06-05 19:03:05 UTC
+++ components/cookie_config/cookie_store_util.cc
@@ -11,7 +11,7 @@

@@ -9,7 +9,7 @@
namespace {

// Use the operating system's mechanisms to encrypt cookies before writing
@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegat
@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor
net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return g_cookie_crypto_delegate.Pointer();
}
6 www/chromium/files/patch-components_filesystem_file__system__app.cc
View file
@@ -1,6 +1,6 @@
--- components/filesystem/file_system_app.cc.orig 2017-05-02 19:02:50 UTC
--- components/filesystem/file_system_app.cc.orig 2017-06-05 19:03:05 UTC
+++ components/filesystem/file_system_app.cc
@@ -23,7 +23,7 @@
@@ -22,7 +22,7 @@
#elif defined(OS_ANDROID)
#include "base/base_paths_android.h"
#include "base/path_service.h"
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#elif defined(OS_MACOSX)
@@ -75,7 +75,7 @@ base::FilePath FileSystemApp::GetUserDat
@@ -78,7 +78,7 @@ base::FilePath FileSystemApp::GetUserDataDir() {
CHECK(PathService::Get(base::DIR_APP_DATA, &path));
#elif defined(OS_ANDROID)
CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
4 www/chromium/files/patch-components_flags__ui_flags__state.cc
View file
@@ -1,6 +1,6 @@
--- components/flags_ui/flags_state.cc.orig 2017-04-19 19:06:32 UTC
--- components/flags_ui/flags_state.cc.orig 2017-06-05 19:03:05 UTC
+++ components/flags_ui/flags_state.cc
@@ -566,7 +566,7 @@ int FlagsState::GetCurrentPlatform() {
@@ -567,7 +567,7 @@ int FlagsState::GetCurrentPlatform() {
return kOsWin;
#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
return kOsCrOS;
8 www/chromium/files/patch-components_metrics_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- components/metrics/BUILD.gn.orig 2017-04-19 19:06:32 UTC
--- components/metrics/BUILD.gn.orig 2017-06-05 19:03:05 UTC
+++ components/metrics/BUILD.gn
@@ -118,6 +118,13 @@ static_library("metrics") {
@@ -121,6 +121,13 @@ static_library("metrics") {
if (is_win) {
sources -= [ "machine_id_provider_stub.cc" ]
}
@@ -14,7 +14,7 @@
}

if (!is_ios) {
@@ -295,7 +302,7 @@ static_library("test_support") {
@@ -298,7 +305,7 @@ static_library("test_support") {
]
}

@@ -23,7 +23,7 @@
static_library("serialization") {
sources = [
"serialization/metric_sample.cc",
@@ -358,7 +365,7 @@ source_set("unit_tests") {
@@ -360,7 +367,7 @@ source_set("unit_tests") {
"//ui/gfx/geometry",
]

4 www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
View file
@@ -1,4 +1,4 @@
--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-04-19 19:06:32 UTC
--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-06-05 19:03:05 UTC
+++ components/metrics/system_memory_stats_recorder_linux.cc
@@ -30,6 +30,7 @@ namespace metrics {
UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
@@ -8,7 +8,7 @@
base::SystemMemoryInfoKB memory;
if (!base::GetSystemMemoryInfo(&memory))
return;
@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStats
@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
break;
}
}
4 www/chromium/files/patch-components_neterror_resources_neterror.js
View file
@@ -1,6 +1,6 @@
--- components/neterror/resources/neterror.js.orig 2017-04-19 19:06:32 UTC
--- components/neterror/resources/neterror.js.orig 2017-06-05 19:03:06 UTC
+++ components/neterror/resources/neterror.js
@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings
@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings) {
}

var primaryControlOnLeft = true;
6 www/chromium/files/patch-components_policy_BUILD.gn
View file
@@ -1,14 +1,14 @@
--- components/policy/BUILD.gn.orig 2017-04-19 19:06:33 UTC
--- components/policy/BUILD.gn.orig 2017-06-05 19:03:06 UTC
+++ components/policy/BUILD.gn
@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be re
@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be referenced on iO
gen_policy_templates_common = true
gen_policy_templates_win = is_win
gen_policy_templates_linux = is_linux
+gen_policy_templates_bsd = is_bsd
gen_policy_templates_android = is_android
gen_policy_templates_mac = is_mac

@@ -159,7 +160,7 @@ grit("grit_policy_templates") {
@@ -169,7 +170,7 @@ grit("grit_policy_templates") {
outputs += policy_templates_android_outputs
defines += [ "gen_policy_templates_android" ]
}
8 www/chromium/files/patch-components_policy_resources_policy__templates.json
View file
@@ -1,4 +1,4 @@
--- components/policy/resources/policy_templates.json.orig 2017-04-19 19:06:33 UTC
--- components/policy/resources/policy_templates.json.orig 2017-06-05 19:03:06 UTC
+++ components/policy/resources/policy_templates.json
@@ -964,7 +964,7 @@
'name': 'RemoteAccessHostMatchUsername',
@@ -18,7 +18,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
@@ -4815,7 +4815,7 @@
@@ -4830,7 +4830,7 @@
'name': 'RequireOnlineRevocationChecksForLocalAnchors',
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -27,7 +27,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
@@ -5723,7 +5723,7 @@
@@ -5738,7 +5738,7 @@
'name': 'BackgroundModeEnabled',
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -36,7 +36,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
@@ -6250,7 +6250,7 @@
@@ -6265,7 +6265,7 @@
'name': 'FullscreenAllowed',
'type': 'main',
'schema': { 'type': 'boolean' },
6 www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
View file
@@ -1,14 +1,14 @@
--- components/storage_monitor/storage_monitor.cc.orig 2017-04-19 19:06:33 UTC
--- components/storage_monitor/storage_monitor.cc.orig 2017-06-05 19:03:06 UTC
+++ components/storage_monitor/storage_monitor.cc
@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:
@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor::GetAllAvailab

void StorageMonitor::EnsureInitialized(base::Closure callback) {
DCHECK(thread_checker_.CalledOnValidThread());
+//#if !defined(OS_BSD) //XXX(rene) why disabled?
if (initialized_) {
if (!callback.is_null())
callback.Run();
@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(b
@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(base::Closure c

initializing_ = true;
Init();
51 www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
View file
@@ -1,6 +1,6 @@
--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-04-22 13:58:19 UTC
--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-06-11 01:51:38 UTC
+++ components/storage_monitor/storage_monitor_freebsd.cc
@@ -0,0 +1,101 @@
@@ -0,0 +1,54 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -31,53 +31,6 @@
+
+namespace {
+
+// udev device property constants.
+const char kBlockSubsystemKey[] = "block";
+const char kDiskDeviceTypeKey[] = "disk";
+const char kFsUUID[] = "ID_FS_UUID";
+const char kLabel[] = "ID_FS_LABEL";
+const char kModel[] = "ID_MODEL";
+const char kModelID[] = "ID_MODEL_ID";
+const char kRemovableSysAttr[] = "removable";
+const char kSerialShort[] = "ID_SERIAL_SHORT";
+const char kSizeSysAttr[] = "size";
+const char kVendor[] = "ID_VENDOR";
+const char kVendorID[] = "ID_VENDOR_ID";
+
+StorageMonitor::EjectStatus EjectPathOnFileThread(
+ const base::FilePath& path,
+ const base::FilePath& device) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+
+ static const char kUmountBinary[] = "/sbin/umount";
+ std::vector<std::string> command;
+ command.push_back(kUmountBinary);
+ command.push_back(path.value());
+
+ base::LaunchOptions options;
+ base::Process process = base::LaunchProcess(command, options);
+ if (!process.IsValid())
+ return StorageMonitor::EJECT_FAILURE;
+
+ int exit_code = -1;
+ if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
+ &exit_code)) {
+ process.Terminate(-1, false);
+ base::EnsureProcessTerminated(std::move(process));
+ return StorageMonitor::EJECT_FAILURE;
+ }
+
+ // TODO(gbillock): Make sure this is found in documentation
+ // somewhere. Experimentally it seems to hold that exit code
+ // 1 means device is in use.
+ if (exit_code == 1)
+ return StorageMonitor::EJECT_IN_USE;
+ if (exit_code != 0)
+ return StorageMonitor::EJECT_FAILURE;
+
+ return StorageMonitor::EJECT_OK;
+}
+
+} // namespace
+
+StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
4 www/chromium/files/patch-components_sync_base_get__session__name.cc
View file
@@ -1,4 +1,4 @@
--- components/sync/base/get_session_name.cc.orig 2017-04-19 19:06:33 UTC
--- components/sync/base/get_session_name.cc.orig 2017-06-05 19:03:06 UTC
+++ components/sync/base/get_session_name.cc
@@ -15,7 +15,7 @@

@@ -9,7 +9,7 @@
#include "components/sync/base/get_session_name_linux.h"
#elif defined(OS_IOS)
#include "components/sync/base/get_session_name_ios.h"
@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously(
@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously() {
session_name = "Chromebook";
break;
}
11 ...mium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc
View file

This file was deleted.

11 www/chromium/files/patch-components_tracing_child_child__trace__message__filter.cc
View file
@@ -0,0 +1,11 @@
--- components/tracing/child/child_trace_message_filter.cc.orig 2017-06-05 19:03:06 UTC
+++ components/tracing/child/child_trace_message_filter.cc
@@ -35,7 +35,7 @@ void ChildTraceMessageFilter::OnFilterAdded(IPC::Chann
sender_ = channel;
sender_->Send(new TracingHostMsg_ChildSupportsTracing());

-#if !defined(OS_LINUX) && !defined(OS_NACL)
+#if !defined(OS_LINUX) && !defined(OS_NACL) && !defined(OS_BSD)
// On linux the browser process takes care of dumping process metrics.
// The child process is not allowed to do so due to BPF sandbox.
tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
18 ...hromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc
View file
@@ -1,6 +1,6 @@
--- components/tracing/common/process_metrics_memory_dump_provider.cc.orig 2017-04-19 19:06:33 UTC
--- components/tracing/common/process_metrics_memory_dump_provider.cc.orig 2017-06-05 19:03:06 UTC
+++ components/tracing/common/process_metrics_memory_dump_provider.cc
@@ -56,7 +56,7 @@ base::LazyInstance<
@@ -57,7 +57,7 @@ base::LazyInstance<
std::unique_ptr<ProcessMetricsMemoryDumpProvider>>>::Leaky
g_dump_providers_map = LAZY_INSTANCE_INITIALIZER;

@@ -9,7 +9,7 @@
const char kClearPeakRssCommand[] = "5";

const uint32_t kMaxLineSize = 4096;
@@ -190,13 +190,13 @@ bool GetResidentSizeFromStatmFile(int fd
@@ -191,13 +191,13 @@ bool GetResidentSizeFromStatmFile(int fd, uint64_t* re
return num_scanned == 1;
}

@@ -25,7 +25,7 @@
// Just pass ProcessId instead of handle since they are the same in linux and
// android.
return base::ProcessMetrics::CreateProcessMetrics(process);
@@ -205,7 +205,7 @@ std::unique_ptr<base::ProcessMetrics> Cr
@@ -206,7 +206,7 @@ std::unique_ptr<base::ProcessMetrics> CreateProcessMet
// additional information like ProcessHandle or port provider.
NOTREACHED();
return std::unique_ptr<base::ProcessMetrics>();
@@ -34,7 +34,7 @@
}

} // namespace
@@ -217,7 +217,7 @@ uint64_t ProcessMetricsMemoryDumpProvide
@@ -218,7 +218,7 @@ uint64_t ProcessMetricsMemoryDumpProvider::rss_bytes_f
ProcessMetricsMemoryDumpProvider::FactoryFunction
ProcessMetricsMemoryDumpProvider::factory_for_testing = nullptr;

@@ -43,7 +43,7 @@

// static
FILE* ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = nullptr;
@@ -244,7 +244,7 @@ bool ProcessMetricsMemoryDumpProvider::D
@@ -245,7 +245,7 @@ bool ProcessMetricsMemoryDumpProvider::DumpProcessMemo
pmd->set_has_process_mmaps();
return res;
}
@@ -52,7 +52,7 @@

#if defined(OS_WIN)
bool ProcessMetricsMemoryDumpProvider::DumpProcessMemoryMaps(
@@ -620,7 +620,7 @@ bool ProcessMetricsMemoryDumpProvider::D
@@ -628,7 +628,7 @@ bool ProcessMetricsMemoryDumpProvider::DumpProcessTota

#if !defined(OS_IOS)
peak_rss_bytes = process_metrics_->GetPeakWorkingSetSize();
@@ -61,7 +61,7 @@
if (is_rss_peak_resettable_) {
std::string clear_refs_file =
"/proc/" +
@@ -670,7 +670,7 @@ bool ProcessMetricsMemoryDumpProvider::D
@@ -672,7 +672,7 @@ bool ProcessMetricsMemoryDumpProvider::DumpProcessTota
void ProcessMetricsMemoryDumpProvider::PollFastMemoryTotal(
uint64_t* memory_total) {
*memory_total = 0;
@@ -70,7 +70,7 @@
int statm_fd = fast_polling_statm_fd_for_testing;
if (statm_fd == -1) {
if (!fast_polling_statm_fd_.is_valid()) {
@@ -698,7 +698,7 @@ void ProcessMetricsMemoryDumpProvider::P
@@ -700,7 +700,7 @@ void ProcessMetricsMemoryDumpProvider::PollFastMemoryT
}

void ProcessMetricsMemoryDumpProvider::SuspendFastMemoryPolling() {
6 ...chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h
View file
@@ -1,6 +1,6 @@
--- components/tracing/common/process_metrics_memory_dump_provider.h.orig 2017-04-19 19:06:33 UTC
--- components/tracing/common/process_metrics_memory_dump_provider.h.orig 2017-06-05 19:03:06 UTC
+++ components/tracing/common/process_metrics_memory_dump_provider.h
@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemor
@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemoryDumpProvider
#elif defined(OS_WIN)
FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest,
TestWinModuleReading);
@@ -9,7 +9,7 @@
FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest,
DoubleRegister);
#endif
@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemor
@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemoryDumpProvider
static uint64_t rss_bytes_for_testing;
static FactoryFunction factory_for_testing;

4 www/chromium/files/patch-components_update__client_update__query__params.cc
View file
@@ -1,6 +1,6 @@
--- components/update_client/update_query_params.cc.orig 2017-04-19 19:06:33 UTC
--- components/update_client/update_query_params.cc.orig 2017-06-05 19:03:06 UTC
+++ components/update_client/update_query_params.cc
@@ -34,6 +34,8 @@ const char kOs[] =
@@ -35,6 +35,8 @@ const char kOs[] =
"linux";
#elif defined(OS_OPENBSD)
"openbsd";
4 www/chromium/files/patch-content_app_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- content/app/BUILD.gn.orig 2017-04-19 19:06:33 UTC
--- content/app/BUILD.gn.orig 2017-06-05 19:03:06 UTC
+++ content/app/BUILD.gn
@@ -68,7 +68,7 @@ template("implement_content_app") {
@@ -67,7 +67,7 @@ template("implement_content_app") {
]
}

10 www/chromium/files/patch-content_app_content__main__runner.cc
View file
@@ -1,6 +1,6 @@
--- content/app/content_main_runner.cc.orig 2017-04-19 19:06:33 UTC
--- content/app/content_main_runner.cc.orig 2017-06-05 19:03:06 UTC
+++ content/app/content_main_runner.cc
@@ -92,10 +92,10 @@
@@ -86,10 +86,10 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"

@@ -13,7 +13,7 @@
#include "content/zygote/zygote_main.h"
#endif

@@ -365,7 +365,7 @@ struct MainFunction {
@@ -312,7 +312,7 @@ struct MainFunction {
int (*function)(const MainFunctionParams&);
};

@@ -22,7 +22,7 @@
// On platforms that use the zygote, we have a special subset of
// subprocesses that are launched via the zygote. This function
// fills in some process-launching bits around ZygoteMain().
@@ -426,7 +426,7 @@ int RunZygote(const MainFunctionParams&
@@ -373,7 +373,7 @@ int RunZygote(const MainFunctionParams& main_function_
NOTREACHED() << "Unknown zygote process type: " << process_type;
return 1;
}
@@ -31,7 +31,7 @@

static void RegisterMainThreadFactories() {
#if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
@@ -492,7 +492,7 @@ int RunNamedProcessTypeMain(
@@ -439,7 +439,7 @@ int RunNamedProcessTypeMain(
}
}

14 www/chromium/files/patch-content_browser_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- content/browser/BUILD.gn.orig 2017-04-19 19:06:33 UTC
--- content/browser/BUILD.gn.orig 2017-06-05 19:03:06 UTC
+++ content/browser/BUILD.gn
@@ -1464,11 +1464,6 @@ source_set("browser") {
@@ -1498,11 +1498,6 @@ source_set("browser") {
"memory/memory_monitor_chromeos.cc",
"memory/memory_monitor_chromeos.h",
]
@@ -12,7 +12,7 @@
}

if (!is_win) {
@@ -1540,7 +1535,7 @@ source_set("browser") {
@@ -1571,7 +1566,7 @@ source_set("browser") {

# Desktop screen capture implementations, conditionally built depending on
# the available implementations for each platform.
@@ -21,7 +21,7 @@
defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
sources += [
"media/capture/cursor_renderer.cc",
@@ -1727,7 +1722,7 @@ source_set("browser") {
@@ -1759,7 +1754,7 @@ source_set("browser") {
}
}

@@ -30,7 +30,7 @@
deps += [ "//build/linux:fontconfig" ]
}

@@ -1880,6 +1875,17 @@ source_set("browser") {
@@ -1919,6 +1914,17 @@ source_set("browser") {
"//chromeos",
"//chromeos:power_manager_proto",
]
@@ -47,8 +47,8 @@
+ ]
}

if (enable_mojo_media) {
@@ -1998,11 +2004,11 @@ source_set("browser") {
if (use_aura) {
@@ -2029,11 +2035,11 @@ source_set("browser") {
]
}

4 www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h
View file
@@ -1,6 +1,6 @@
--- content/browser/accessibility/browser_accessibility.h.orig 2017-04-19 19:06:33 UTC
--- content/browser/accessibility/browser_accessibility.h.orig 2017-06-05 19:03:06 UTC
+++ content/browser/accessibility/browser_accessibility.h
@@ -40,7 +40,7 @@
@@ -42,7 +42,7 @@
#define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
#endif

4 www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
View file
@@ -1,4 +1,4 @@
--- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-04-19 19:06:33 UTC
--- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-06-05 19:03:06 UTC
+++ content/browser/accessibility/browser_accessibility_manager.h
@@ -36,7 +36,7 @@ class BrowserAccessibilityManager;
class BrowserAccessibilityManagerAndroid;
@@ -9,7 +9,7 @@
class BrowserAccessibilityManagerAuraLinux;
#elif defined(OS_MACOSX)
class BrowserAccessibilityManagerMac;
@@ -248,7 +248,7 @@ class CONTENT_EXPORT BrowserAccessibilit
@@ -251,7 +251,7 @@ class CONTENT_EXPORT BrowserAccessibilityManager : pub
BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid();
#endif

4 www/chromium/files/patch-content_browser_browser__main__loop.cc
View file
@@ -1,4 +1,4 @@
--- content/browser/browser_main_loop.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/browser_main_loop.cc.orig 2017-06-05 19:03:06 UTC
+++ content/browser/browser_main_loop.cc
@@ -210,6 +210,11 @@
#include "gpu/vulkan/vulkan_implementation.h"
@@ -21,7 +21,7 @@
void SetupSandbox(const base::CommandLine& parsed_command_line) {
TRACE_EVENT0("startup", "SetupSandbox");
if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
@@ -584,10 +589,15 @@ void BrowserMainLoop::Init() {
@@ -553,10 +558,15 @@ void BrowserMainLoop::Init() {
void BrowserMainLoop::EarlyInitialization() {
TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");

12 www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
View file
@@ -1,22 +1,22 @@
--- content/browser/child_process_launcher_helper_linux.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/child_process_launcher_helper_linux.cc.orig 2017-06-05 19:03:06 UTC
+++ content/browser/child_process_launcher_helper_linux.cc
@@ -67,6 +67,7 @@ ChildProcessLauncherHelper::LaunchProces
@@ -66,6 +66,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;

+#if !defined(OS_BSD)
ZygoteHandle* zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ?
nullptr : delegate_->GetZygote();
@@ -86,6 +87,7 @@ ChildProcessLauncherHelper::LaunchProces
@@ -85,6 +86,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
process.zygote = *zygote_handle;
return process;
}
+#endif

Process process;
process.process = base::LaunchProcess(*command_line(), options);
@@ -105,10 +107,12 @@ base::TerminationStatus ChildProcessLaun
@@ -103,10 +105,12 @@ base::TerminationStatus ChildProcessLauncherHelper::Ge
const ChildProcessLauncherHelper::Process& process,
bool known_dead,
int* exit_code) {
@@ -29,7 +29,7 @@
if (known_dead) {
return base::GetKnownDeadTerminationStatus(
process.process.Handle(), exit_code);
@@ -127,13 +131,17 @@ void ChildProcessLauncherHelper::ForceNo
@@ -125,13 +129,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
ChildProcessLauncherHelper::Process process) {
process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
@@ -46,4 +46,4 @@
+#endif
}

// static
void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread(
4 www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/devtools/protocol/color_picker.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/devtools/protocol/color_picker.cc.orig 2017-06-05 19:03:06 UTC
+++ content/browser/devtools/protocol/color_picker.cc
@@ -153,7 +153,7 @@ void ColorPicker::UpdateCursor() {
@@ -154,7 +154,7 @@ void ColorPicker::UpdateCursor() {
// magnified projection only with centered hotspot.
// Mac Retina requires cursor to be > 120px in order to render smoothly.

6 www/chromium/files/patch-content_browser_download_base__file.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/download/base_file.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/download/base_file.cc.orig 2017-06-05 19:03:06 UTC
+++ content/browser/download/base_file.cc
@@ -380,7 +380,7 @@ DownloadInterruptReason BaseFile::LogInt
@@ -387,7 +387,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason(
return reason;
}

@@ -9,7 +9,7 @@

namespace {

@@ -463,7 +463,7 @@ DownloadInterruptReason BaseFile::Annota
@@ -470,7 +470,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn
}
return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
}
10 www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -396,7 +396,7 @@ bool GpuDataManagerImplPrivate::GpuAcces
@@ -402,7 +402,7 @@ bool GpuDataManagerImplPrivate::GpuAccessAllowed(
// strings even if all features are blacklisted. If all GPU features are
// disabled, the GPU process will only initialize GL bindings, create a GL
// context, and collect full GPU info.
@@ -9,7 +9,7 @@
if (reason) {
*reason = "All GPU features are blacklisted.";
}
@@ -513,8 +513,10 @@ void GpuDataManagerImplPrivate::SetGLStr
@@ -516,8 +516,10 @@ void GpuDataManagerImplPrivate::SetGLStrings(const std
gpu_info.gl_renderer = gl_renderer;
gpu_info.gl_version = gl_version;

@@ -20,7 +20,7 @@

UpdateGpuInfo(gpu_info);
UpdateGpuSwitchingManager(gpu_info);
@@ -572,10 +574,12 @@ void GpuDataManagerImplPrivate::Initiali
@@ -575,10 +577,12 @@ void GpuDataManagerImplPrivate::Initialize() {
// Skip collecting the basic driver info if SetGpuInfo() is already called.
if (IsCompleteGpuInfoAvailable()) {
gpu_info = gpu_info_;
@@ -33,7 +33,7 @@
}

if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
@@ -686,7 +690,9 @@ void GpuDataManagerImplPrivate::UpdateGp
@@ -695,7 +699,9 @@ void GpuDataManagerImplPrivate::UpdateGpuInfo(const gp
return;

bool was_info_available = IsCompleteGpuInfoAvailable();
4 www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
View file
@@ -1,6 +1,6 @@
--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-04-19 19:06:33 UTC
--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-06-05 19:03:07 UTC
+++ content/browser/gpu/gpu_data_manager_impl_private.h
@@ -156,7 +156,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
@@ -153,7 +153,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
UnblockOtherDomainFrom3DAPIs);
FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,
UnblockThisDomainFrom3DAPIs);
4 www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
View file
@@ -1,4 +1,4 @@
--- content/browser/gpu/gpu_internals_ui.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/gpu/gpu_internals_ui.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/gpu/gpu_internals_ui.cc
@@ -43,7 +43,7 @@
#include "third_party/skia/include/core/SkMilestone.h"
@@ -18,7 +18,7 @@
#include "ui/base/x/x11_util.h" // nogncheck
#include "ui/gfx/x/x11_atom_cache.h" // nogncheck
#endif
@@ -204,7 +204,7 @@ base::DictionaryValue* GpuInfoAsDictiona
@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictionaryValue() {
gpu_info.gl_ws_version));
basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
gpu_info.gl_ws_extensions));
4 www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/gpu/gpu_process_host.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/gpu/gpu_process_host.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/gpu/gpu_process_host.cc
@@ -1024,7 +1024,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp
@@ -965,7 +965,7 @@ bool GpuProcessHost::LaunchGpuProcess(gpu::GpuPreferen
std::unique_ptr<base::CommandLine> cmd_line =
base::MakeUnique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
#else
4 www/chromium/files/patch-content_browser_media_media__internals.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/media/media_internals.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/media/media_internals.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/media/media_internals.cc
@@ -774,7 +774,7 @@ void MediaInternals::UpdateVideoCaptureD
@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
device_dict->SetString("name", descriptor.GetNameAndModel());
device_dict->Set("formats", format_list);
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
4 www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/memory/memory_coordinator_impl.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/memory/memory_coordinator_impl.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/memory/memory_coordinator_impl.cc
@@ -90,8 +90,12 @@ void MemoryCoordinatorHandleImpl::AddChi
@@ -138,8 +138,12 @@ void MemoryCoordinatorHandleImpl::AddChild(
struct MemoryCoordinatorImplSingletonTraits
: public base::LeakySingletonTraits<MemoryCoordinatorImpl> {
static MemoryCoordinatorImpl* New() {
4 www/chromium/files/patch-content_browser_memory_memory__monitor.cc
View file
@@ -1,4 +1,4 @@
--- content/browser/memory/memory_monitor.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/memory/memory_monitor.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/memory/memory_monitor.cc
@@ -8,6 +8,7 @@

@@ -8,7 +8,7 @@
// static
MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() {
return base::Singleton<
@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMem
@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo(
base::SystemMemoryInfoKB* mem_info) {
base::GetSystemMemoryInfo(mem_info);
}
10 www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/ppapi_plugin_process_host.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/ppapi_plugin_process_host.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/ppapi_plugin_process_host.cc
@@ -55,9 +55,9 @@
@@ -54,9 +54,9 @@

namespace content {

@@ -12,7 +12,7 @@

// NOTE: changes to this class need to be reviewed by the security team.
class PpapiPluginSandboxedProcessLauncherDelegate
@@ -111,7 +111,7 @@ class PpapiPluginSandboxedProcessLaunche
@@ -110,7 +110,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate
return true;
}

@@ -21,7 +21,7 @@
ZygoteHandle* GetZygote() override {
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
@@ -205,13 +205,13 @@ PpapiPluginProcessHost* PpapiPluginProce
@@ -204,13 +204,13 @@ PpapiPluginProcessHost* PpapiPluginProcessHost::Create
return NULL;
}

@@ -37,7 +37,7 @@

// static
void PpapiPluginProcessHost::DidCreateOutOfProcessInstance(
@@ -363,7 +363,7 @@ bool PpapiPluginProcessHost::Init(const
@@ -362,7 +362,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
base::CommandLine::StringType plugin_launcher =
browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);

20 www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc
View file

This file was deleted.

4 www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/renderer_host/render_message_filter.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/renderer_host/render_message_filter.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/renderer_host/render_message_filter.cc
@@ -89,7 +89,7 @@
@@ -84,7 +84,7 @@
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
#endif

6 www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
View file
@@ -1,7 +1,7 @@
--- content/browser/renderer_host/render_message_filter.h.orig 2017-04-19 19:06:33 UTC
--- content/browser/renderer_host/render_message_filter.h.orig 2017-06-05 19:03:07 UTC
+++ content/browser/renderer_host/render_message_filter.h
@@ -132,7 +132,7 @@ class CONTENT_EXPORT RenderMessageFilter
const std::list<base::ProcessHandle>& handles);
@@ -130,7 +130,7 @@ class CONTENT_EXPORT RenderMessageFilter
bool has_gpu);
void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);

-#if defined(OS_LINUX)
22 www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-04-19 19:06:33 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -378,11 +378,11 @@ SiteProcessMap* GetSiteProcessMapForBrow
--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-06-15 21:03:05.000000000 +0200
+++ content/browser/renderer_host/render_process_host_impl.cc 2017-06-18 13:40:02.058069000 +0200
@@ -381,11 +381,11 @@
return map;
}

@@ -14,7 +14,7 @@

// NOTE: changes to this class need to be reviewed by the security team.
class RendererSandboxedProcessLauncherDelegate
@@ -405,7 +405,7 @@ class RendererSandboxedProcessLauncherDe
@@ -408,7 +408,7 @@
return GetContentClient()->browser()->PreSpawnRenderer(policy);
}

@@ -23,7 +23,7 @@
ZygoteHandle* GetZygote() override {
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
@@ -655,7 +655,7 @@ void RenderProcessHost::SetMaxRendererPr
@@ -647,7 +647,7 @@
g_max_renderer_count_override = count;
}

@@ -32,7 +32,7 @@
// static
void RenderProcessHostImpl::EarlyZygoteLaunch() {
DCHECK(!g_render_zygote);
@@ -665,7 +665,7 @@ void RenderProcessHostImpl::EarlyZygoteL
@@ -657,7 +657,7 @@
ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus(
(*GetGenericZygote())->GetSandboxStatus());
}
@@ -41,7 +41,7 @@

RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@@ -813,7 +813,7 @@ bool RenderProcessHostImpl::Init() {
@@ -807,7 +807,7 @@
renderer_prefix =
browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);

@@ -50,3 +50,11 @@
int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
: ChildProcessHost::CHILD_NORMAL;
#else
@@ -1551,7 +1551,6 @@

--visible_widgets_;
if (visible_widgets_ == 0) {
- DCHECK(!is_process_backgrounded_);
UpdateProcessPriority();
}
}
4 www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
@@ -140,7 +140,7 @@ void GetPlatformSpecificPrefs(RendererPr
@@ -142,7 +142,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
8 www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -116,7 +116,7 @@
@@ -114,7 +114,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#endif

@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
@@ -2031,7 +2031,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
@@ -2040,7 +2040,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}

bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -18,7 +18,7 @@
return NeedsInputGrab();
#endif
return false;
@@ -2231,7 +2231,7 @@ void RenderWidgetHostViewAura::ForwardKe
@@ -2241,7 +2241,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent(
if (!target_host)
return;

4 .../files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -546,7 +546,7 @@ bool RenderWidgetHostViewEventHandler::C
@@ -548,7 +548,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
if (event->type() == ui::ET_MOUSE_EXITED) {
if (mouse_locked || selection_popup)
return false;
6 www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/tracing/tracing_controller_impl.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/tracing/tracing_controller_impl.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/tracing/tracing_controller_impl.cc
@@ -476,7 +476,7 @@ void TracingControllerImpl::AddTraceMess
@@ -412,7 +412,7 @@ void TracingControllerImpl::AddTraceMessageFilter(
return;
}

@@ -9,7 +9,7 @@
// On Linux the browser process dumps process metrics for child process due to
// sandbox.
tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
@@ -504,7 +504,7 @@ void TracingControllerImpl::RemoveTraceM
@@ -440,7 +440,7 @@ void TracingControllerImpl::RemoveTraceMessageFilter(
return;
}

16 www/chromium/files/patch-content_browser_utility__process__host__impl.cc
View file
@@ -1,6 +1,6 @@
--- content/browser/utility_process_host_impl.cc.orig 2017-04-19 19:06:33 UTC
--- content/browser/utility_process_host_impl.cc.orig 2017-06-05 19:03:07 UTC
+++ content/browser/utility_process_host_impl.cc
@@ -44,9 +44,9 @@
@@ -43,9 +43,9 @@
#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/ui_base_switches.h"

@@ -12,7 +12,7 @@

#if defined(OS_WIN)
#include "sandbox/win/src/sandbox_policy.h"
@@ -55,11 +55,11 @@
@@ -54,11 +54,11 @@

namespace content {

@@ -26,7 +26,7 @@

// NOTE: changes to this class need to be reviewed by the security team.
class UtilitySandboxedProcessLauncherDelegate
@@ -74,10 +74,10 @@ class UtilitySandboxedProcessLauncherDel
@@ -73,10 +73,10 @@ class UtilitySandboxedProcessLauncherDelegate
launch_elevated_(launch_elevated)
#elif defined(OS_POSIX)
env_(env)
@@ -39,7 +39,7 @@
#endif // OS_WIN
{}

@@ -106,13 +106,13 @@ class UtilitySandboxedProcessLauncherDel
@@ -105,13 +105,13 @@ class UtilitySandboxedProcessLauncherDelegate

#elif defined(OS_POSIX)

@@ -55,7 +55,7 @@
base::EnvironmentMap GetEnvironment() override { return env_; }
#endif // OS_WIN

@@ -127,9 +127,9 @@ class UtilitySandboxedProcessLauncherDel
@@ -126,9 +126,9 @@ class UtilitySandboxedProcessLauncherDelegate
bool launch_elevated_;
#elif defined(OS_POSIX)
base::EnvironmentMap env_;
@@ -67,7 +67,7 @@
#endif // OS_WIN
};

@@ -154,7 +154,7 @@ UtilityProcessHostImpl::UtilityProcessHo
@@ -153,7 +153,7 @@ UtilityProcessHostImpl::UtilityProcessHostImpl(
is_batch_mode_(false),
no_sandbox_(false),
run_elevated_(false),
@@ -76,7 +76,7 @@
child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
#else
child_flags_(ChildProcessHost::CHILD_NORMAL),
@@ -236,13 +236,13 @@ void UtilityProcessHostImpl::SetName(con
@@ -237,13 +237,13 @@ void UtilityProcessHostImpl::SetName(const base::strin
name_ = name;
}

4 www/chromium/files/patch-content_child_child__process.cc
View file
@@ -1,6 +1,6 @@
--- content/child/child_process.cc.orig 2017-04-19 19:06:33 UTC
--- content/child/child_process.cc.orig 2017-06-05 19:03:07 UTC
+++ content/child/child_process.cc
@@ -133,7 +133,7 @@ void ChildProcess::ReleaseProcess() {
@@ -129,7 +129,7 @@ void ChildProcess::ReleaseProcess() {
main_thread_->OnProcessFinalRelease();
}

4 www/chromium/files/patch-content_child_child__process.h
View file
@@ -1,6 +1,6 @@
--- content/child/child_process.h.orig 2017-04-19 19:06:33 UTC
--- content/child/child_process.h.orig 2017-06-05 19:03:07 UTC
+++ content/child/child_process.h
@@ -82,7 +82,7 @@ class CONTENT_EXPORT ChildProcess {
@@ -79,7 +79,7 @@ class CONTENT_EXPORT ChildProcess {
void AddRefProcess();
void ReleaseProcess();

4 www/chromium/files/patch-content_child_child__thread__impl.cc
View file
@@ -1,6 +1,6 @@
--- content/child/child_thread_impl.cc.orig 2017-04-19 19:06:33 UTC
--- content/child/child_thread_impl.cc.orig 2017-06-05 19:03:07 UTC
+++ content/child/child_thread_impl.cc
@@ -699,7 +699,7 @@ std::unique_ptr<base::SharedMemory> Chil
@@ -698,7 +698,7 @@ std::unique_ptr<base::SharedMemory> ChildThreadImpl::A
return base::MakeUnique<base::SharedMemory>(shared_buf, false);
}

4 www/chromium/files/patch-content_child_child__thread__impl.h
View file
@@ -1,6 +1,6 @@
--- content/child/child_thread_impl.h.orig 2017-04-19 19:06:33 UTC
--- content/child/child_thread_impl.h.orig 2017-06-05 19:03:07 UTC
+++ content/child/child_thread_impl.h
@@ -116,7 +116,7 @@ class CONTENT_EXPORT ChildThreadImpl
@@ -112,7 +112,7 @@ class CONTENT_EXPORT ChildThreadImpl
static std::unique_ptr<base::SharedMemory> AllocateSharedMemory(
size_t buf_size);

6 www/chromium/files/patch-content_common_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- content/common/BUILD.gn.orig 2017-04-19 19:06:33 UTC
--- content/common/BUILD.gn.orig 2017-06-05 19:03:07 UTC
+++ content/common/BUILD.gn
@@ -503,7 +503,7 @@ source_set("common") {
@@ -508,7 +508,7 @@ source_set("common") {
}

if (!use_seccomp_bpf) {
@@ -9,7 +9,7 @@
sources -= [
"sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
"sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",
@@ -517,6 +517,16 @@ source_set("common") {
@@ -522,6 +522,16 @@ source_set("common") {
"sandbox_linux/bpf_utility_policy_linux.h",
"sandbox_linux/sandbox_bpf_base_policy_linux.cc",
"sandbox_linux/sandbox_bpf_base_policy_linux.h",
6 www/chromium/files/patch-content_common_child__process__messages.h
View file
@@ -1,4 +1,4 @@
--- content/common/child_process_messages.h.orig 2017-04-19 19:06:33 UTC
--- content/common/child_process_messages.h.orig 2017-06-05 19:03:07 UTC
+++ content/common/child_process_messages.h
@@ -26,7 +26,7 @@
#include "ui/gfx/ipc/gfx_param_traits.h"
@@ -9,7 +9,7 @@
#include "base/threading/platform_thread.h"
#endif

@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects:
@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSn
IPC_STRUCT_TRAITS_MEMBER(process_id)
IPC_STRUCT_TRAITS_END()

@@ -18,7 +18,7 @@
IPC_ENUM_TRAITS_MAX_VALUE(base::ThreadPriority,
base::ThreadPriority::REALTIME_AUDIO)
#endif
@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcess
@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcessHostMsg_PreCac
IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ReleaseCachedFonts)
#endif // defined(OS_WIN)

4 www/chromium/files/patch-content_common_content__switches__internal.cc
View file
@@ -1,6 +1,6 @@
--- content/common/content_switches_internal.cc.orig 2017-04-19 19:06:33 UTC
--- content/common/content_switches_internal.cc.orig 2017-06-05 19:03:07 UTC
+++ content/common/content_switches_internal.cc
@@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnable
@@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault {
#endif

bool IsUseZoomForDSFEnabledByDefault() {
4 www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
View file
@@ -1,4 +1,4 @@
--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-04-19 19:06:34 UTC
--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-06-05 19:03:07 UTC
+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc
@@ -7,7 +7,9 @@
#include <errno.h>
@@ -10,7 +10,7 @@
#include <unistd.h>

#include "base/command_line.h"
@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableSt
@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableStatusAndHandler
return true;
}

4 www/chromium/files/patch-content_common_view__messages.h
View file
@@ -1,6 +1,6 @@
--- content/common/view_messages.h.orig 2017-04-19 19:06:34 UTC
--- content/common/view_messages.h.orig 2017-06-05 19:03:07 UTC
+++ content/common/view_messages.h
@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere
@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video)
IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
4 www/chromium/files/patch-content_gpu_BUILD.gn
View file
@@ -1,6 +1,6 @@
--- content/gpu/BUILD.gn.orig 2017-04-19 19:06:34 UTC
--- content/gpu/BUILD.gn.orig 2017-06-05 19:03:07 UTC
+++ content/gpu/BUILD.gn
@@ -98,6 +98,7 @@ target(link_target_type, "gpu_sources")
@@ -106,6 +106,7 @@ target(link_target_type, "gpu_sources") {

if (use_x11) {
deps += [ "//ui/events/platform/x11" ]
18 www/chromium/files/patch-content_gpu_gpu__child__thread.cc
View file

This file was deleted.

8 www/chromium/files/patch-content_gpu_gpu__main.cc
View file
@@ -1,6 +1,6 @@
--- content/gpu/gpu_main.cc.orig 2017-04-19 19:06:34 UTC
--- content/gpu/gpu_main.cc.orig 2017-06-05 19:03:07 UTC
+++ content/gpu/gpu_main.cc
@@ -98,7 +98,7 @@ namespace content {
@@ -96,7 +96,7 @@ namespace content {

namespace {

@@ -9,7 +9,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*);
#elif defined(OS_WIN)
bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
@@ -152,7 +152,7 @@ class ContentSandboxHelper : public gpu:
@@ -150,7 +150,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel

bool EnsureSandboxInitialized(
gpu::GpuWatchdogThread* watchdog_thread) override {
@@ -18,7 +18,7 @@
return StartSandboxLinux(watchdog_thread);
#elif defined(OS_WIN)
return StartSandboxWindows(sandbox_info_);
@@ -313,7 +313,7 @@ int GpuMain(const MainFunctionParams& pa
@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) {

namespace {

4 www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc
View file
@@ -1,6 +1,6 @@
--- content/gpu/in_process_gpu_thread.cc.orig 2017-04-19 19:06:34 UTC
--- content/gpu/in_process_gpu_thread.cc.orig 2017-06-05 19:03:07 UTC
+++ content/gpu/in_process_gpu_thread.cc
@@ -54,8 +54,6 @@ void InProcessGpuThread::Init() {
@@ -55,8 +55,6 @@ void InProcessGpuThread::Init() {
gpu::GPUInfo gpu_info;
if (!gl::init::InitializeGLOneOff())
VLOG(1) << "gl::init::InitializeGLOneOff failed";