update to 49.0
This commit is contained in:
parent
3aaa33c176
commit
5fc288e6ef
@ -1,14 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2016/03/09 14:21:23 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2016/03/23 20:13:06 robert Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
DPB_PROPERTIES= parallel
|
||||
|
||||
COMMENT= Iridium browser
|
||||
|
||||
V= 48.2
|
||||
V= 49.0
|
||||
DISTNAME= iridium-browser-${V}
|
||||
PKGNAME= iridium-${V}
|
||||
REVISION= 1
|
||||
|
||||
WRKDIST= ${WRKDIR}/${DISTNAME:S/rc1//}
|
||||
|
||||
@ -151,7 +150,6 @@ CARCH= x86_64
|
||||
.endif
|
||||
|
||||
REL!= uname -r
|
||||
MAKE_ENV+= CPATH=${LOCALBASE}/include/c++/${MODGCC4_VERSION}.3/bits/:${LOCALBASE}/include/c++/${MODGCC4_VERSION}.3/:${LOCALBASE}/include/c++/${MODGCC4_VERSION}.3/${CARCH}-unknown-openbsd${REL}/
|
||||
|
||||
.if ${FLAVOR:Mdebug}
|
||||
GYP_DEFS+= -Dremove_webcore_debug_symbols=1
|
||||
@ -185,7 +183,7 @@ do-build:
|
||||
@cd ${WRKSRC}/out/${BUILDTYPE} && \
|
||||
for _r in generate_version_info cloud_policy_proto net_interfaces suggestions \
|
||||
cacheinvalidation cacheinvalidation_proto_cpp gfx_vector_icons \
|
||||
data_reduction_proxy_proto cloud_policy_code_generate \
|
||||
data_reduction_proxy_proto cloud_policy_code_generate common_constants \
|
||||
$$(ninja -t targets | grep -E '(mojo_bindings|resources): phony' | grep -v test | cut -d ':' -f1); do \
|
||||
cd ${WRKSRC} && env -i ${MAKE_ENV} ninja \
|
||||
-j ${MAKE_JOBS} -C out/${BUILDTYPE} $${_r}; \
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (iridium-browser-48.2.tar.xz) = 3+WDIIYAD3o7SHg4SmM+6Wqj5dyI2LH4UB90T1f4Fis=
|
||||
SIZE (iridium-browser-48.2.tar.xz) = 433925560
|
||||
SHA256 (iridium-browser-49.0.tar.xz) = Ial3HwAtgYzBYNUemzZSRH9kEpsoFQZ7nQ5D0ZBDw5U=
|
||||
SIZE (iridium-browser-49.0.tar.xz) = 492838136
|
||||
|
@ -148,7 +148,7 @@ void SndioAudioOutputStream::RealTimeThread(void) {
|
||||
pthread_mutex_unlock(&mutex);
|
||||
|
||||
// Get data to play
|
||||
count = source->OnMoreData(audio_bus.get(), hw_delay);
|
||||
count = source->OnMoreData(audio_bus.get(), hw_delay, 0);
|
||||
audio_bus->ToInterleaved(count, params.bits_per_sample() / 8, buffer);
|
||||
if (count == 0) {
|
||||
// We have to submit something to the device
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.2 2015/10/24 18:22:21 robert Exp $
|
||||
--- ash/display/mirror_window_controller.cc.orig.port Wed Oct 7 04:42:06 2015
|
||||
+++ ash/display/mirror_window_controller.cc Wed Oct 14 07:41:12 2015
|
||||
@@ -256,7 +256,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
$OpenBSD: patch-ash_display_mirror_window_controller_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- ash/display/mirror_window_controller.cc.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ ash/display/mirror_window_controller.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -258,7 +258,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
return info.id() == iter->first;
|
||||
}) == display_info_list.end()) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_base_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/base.gypi.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ base/base.gypi Fri Jan 22 19:58:58 2016
|
||||
@@ -990,11 +990,17 @@
|
||||
$OpenBSD: patch-base_base_gypi,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/base.gypi.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/base.gypi Thu Mar 3 09:43:25 2016
|
||||
@@ -994,11 +994,17 @@
|
||||
'process/memory_stubs.cc',
|
||||
],
|
||||
'sources/': [
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_base_paths_posix_cc,v 1.1.1.1 2015/05/03 15:35:38 robert Exp $
|
||||
--- base/base_paths_posix.cc.orig.port Sun May 3 14:57:33 2015
|
||||
+++ base/base_paths_posix.cc Sun May 3 14:57:50 2015
|
||||
@@ -69,7 +69,7 @@ bool PathProviderPosix(int key, FilePath* result) {
|
||||
$OpenBSD: patch-base_base_paths_posix_cc,v 1.2 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/base_paths_posix.cc.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ base/base_paths_posix.cc Wed Mar 23 12:37:29 2016
|
||||
@@ -72,7 +72,7 @@ bool PathProviderPosix(int key, FilePath* result) {
|
||||
if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
|
||||
*result = FilePath(cpath);
|
||||
else
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.3 2015/10/24 18:22:21 robert Exp $
|
||||
--- base/debug/debugger_posix.cc.orig.port Wed Oct 7 04:42:06 2015
|
||||
+++ base/debug/debugger_posix.cc Wed Oct 14 07:41:12 2015
|
||||
@@ -28,6 +28,10 @@
|
||||
$OpenBSD: patch-base_debug_debugger_posix_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/debug/debugger_posix.cc.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ base/debug/debugger_posix.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -30,6 +30,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-base_debug_debugger_posix_cc,v 1.3 2015/10/24 18:22:21 robert Ex
|
||||
#if defined(OS_FREEBSD)
|
||||
#include <sys/user.h>
|
||||
#endif
|
||||
@@ -88,33 +92,38 @@ bool BeingDebugged() {
|
||||
@@ -89,33 +93,38 @@ bool BeingDebugged() {
|
||||
|
||||
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
||||
// binary interfaces may change.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_debug_stack_trace_h,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- base/debug/stack_trace.h.orig.port Fri Mar 22 02:13:43 2013
|
||||
+++ base/debug/stack_trace.h Tue Apr 2 21:05:17 2013
|
||||
@@ -12,6 +12,7 @@
|
||||
$OpenBSD: patch-base_debug_stack_trace_h,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/debug/stack_trace.h.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ base/debug/stack_trace.h Thu Mar 3 09:43:25 2016
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "build/build_config.h"
|
||||
|
||||
#if defined(OS_POSIX)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.4 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/debug/stack_trace_posix.cc.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ base/debug/stack_trace_posix.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -567,6 +567,9 @@ class SandboxSymbolizeHelper {
|
||||
$OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/debug/stack_trace_posix.cc.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/debug/stack_trace_posix.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -569,6 +569,9 @@ class SandboxSymbolizeHelper {
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.4 2016/02/15 18:07:52 robert
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -582,6 +585,7 @@ class SandboxSymbolizeHelper {
|
||||
@@ -584,6 +587,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-base_debug_stack_trace_posix_cc,v 1.4 2016/02/15 18:07:52 robert
|
||||
}
|
||||
|
||||
// Opens all object files and caches their file descriptors.
|
||||
@@ -712,7 +716,7 @@ StackTrace::StackTrace() {
|
||||
@@ -714,7 +718,7 @@ StackTrace::StackTrace() {
|
||||
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||
// stack dumping signal handler). NO malloc or stdio is allowed here.
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.3 2015/10/24 18:22:21 robert Exp $
|
||||
--- base/message_loop/message_loop.cc.orig.port Tue Oct 13 21:04:30 2015
|
||||
+++ base/message_loop/message_loop.cc Wed Oct 14 07:41:12 2015
|
||||
@@ -205,7 +205,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePump
|
||||
$OpenBSD: patch-base_message_loop_message_loop_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/message_loop/message_loop.cc.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/message_loop/message_loop.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -210,7 +210,7 @@ scoped_ptr<MessagePump> MessageLoop::CreateMessagePump
|
||||
// TODO(rvargas): Get rid of the OS guards.
|
||||
#if defined(USE_GLIB) && !defined(OS_NACL)
|
||||
typedef MessagePumpGlib MessagePumpForUI;
|
||||
|
12
www/iridium/patches/patch-base_move_h
Normal file
12
www/iridium/patches/patch-base_move_h
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-base_move_h,v 1.1 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/move.h.orig.port Thu Mar 3 21:35:41 2016
|
||||
+++ base/move.h Thu Mar 3 21:47:09 2016
|
||||
@@ -31,7 +31,7 @@
|
||||
// for more details.
|
||||
// TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN
|
||||
// everywhere instead.
|
||||
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
|
||||
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
||||
#define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type) \
|
||||
private: \
|
||||
type(const type&) = delete; \
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_process_launch_h,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- base/process/launch.h.orig.port Wed Apr 15 00:31:20 2015
|
||||
+++ base/process/launch.h Wed Apr 15 08:32:50 2015
|
||||
@@ -131,7 +131,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
$OpenBSD: patch-base_process_launch_h,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/launch.h.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/process/launch.h Thu Mar 3 09:43:25 2016
|
||||
@@ -134,7 +134,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
// will be the same as its pid.
|
||||
bool new_process_group;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_process_memory_cc,v 1.3 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/process/memory.cc.orig.port Sat Jan 23 10:35:17 2016
|
||||
+++ base/process/memory.cc Sat Jan 23 10:35:24 2016
|
||||
@@ -25,7 +25,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
|
||||
$OpenBSD: patch-base_process_memory_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/memory.cc.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ base/process/memory.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -26,7 +26,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
|
||||
}
|
||||
|
||||
// Defined in memory_mac.mm for Mac.
|
||||
|
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- base/process/process_handle_openbsd.cc.orig.port Fri Oct 18 20:52:30 2013
|
||||
+++ base/process/process_handle_openbsd.cc Fri Oct 18 23:28:42 2013
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
$OpenBSD: patch-base_process_process_handle_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/process_handle_openbsd.cc.orig.port Thu Mar 3 09:47:09 2016
|
||||
+++ base/process/process_handle_openbsd.cc Thu Mar 3 09:49:15 2016
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "base/process/process_handle.h"
|
||||
|
||||
#include <stddef.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/proc.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
@@ -11,39 +13,64 @@
|
||||
@@ -13,39 +15,64 @@
|
||||
namespace base {
|
||||
|
||||
ProcessId GetParentProcessId(ProcessHandle process) {
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- base/process/process_iterator_openbsd.cc.orig.port Sat Sep 28 19:45:12 2013
|
||||
+++ base/process/process_iterator_openbsd.cc Sat Sep 28 19:46:09 2013
|
||||
@@ -5,6 +5,9 @@
|
||||
#include "base/process/process_iterator.h"
|
||||
$OpenBSD: patch-base_process_process_iterator_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/process_iterator_openbsd.cc.orig.port Thu Mar 3 09:49:21 2016
|
||||
+++ base/process/process_iterator_openbsd.cc Thu Mar 3 09:49:53 2016
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <stddef.h>
|
||||
+#include <unistd.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/proc.h>
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_process_process_metrics_h,v 1.2 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/process/process_metrics.h.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ base/process/process_metrics.h Fri Jan 22 19:58:58 2016
|
||||
@@ -240,7 +240,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
|
||||
$OpenBSD: patch-base_process_process_metrics_h,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/process_metrics.h.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/process/process_metrics.h Thu Mar 3 09:43:25 2016
|
||||
@@ -250,7 +250,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
|
||||
#endif // defined(OS_POSIX)
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- base/process/process_metrics_openbsd.cc.orig.port Wed Dec 3 03:13:19 2014
|
||||
+++ base/process/process_metrics_openbsd.cc Sat Dec 6 12:13:17 2014
|
||||
@@ -4,8 +4,19 @@
|
||||
|
||||
$OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/process_metrics_openbsd.cc.orig.port Thu Mar 3 09:50:00 2016
|
||||
+++ base/process/process_metrics_openbsd.cc Thu Mar 3 09:52:22 2016
|
||||
@@ -5,10 +5,21 @@
|
||||
#include "base/macros.h"
|
||||
#include "base/process/process_metrics.h"
|
||||
|
||||
+#include "base/files/file_util.h"
|
||||
@ -15,13 +15,15 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.2 2015/05/06 14:27:2
|
||||
+#include "base/sys_info.h"
|
||||
+#include "base/threading/thread_restrictions.h"
|
||||
+
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
+#include <sys/vmmeter.h>
|
||||
|
||||
namespace base {
|
||||
|
||||
@@ -15,20 +26,27 @@ ProcessMetrics* ProcessMetrics::CreateProcessMetrics(P
|
||||
@@ -18,20 +29,27 @@ ProcessMetrics* ProcessMetrics::CreateProcessMetrics(P
|
||||
}
|
||||
|
||||
size_t ProcessMetrics::GetPagefileUsage() const {
|
||||
@ -54,7 +56,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.2 2015/05/06 14:27:2
|
||||
}
|
||||
|
||||
size_t ProcessMetrics::GetPeakPagefileUsage() const {
|
||||
@@ -36,20 +54,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const {
|
||||
@@ -39,20 +57,28 @@ size_t ProcessMetrics::GetPeakPagefileUsage() const {
|
||||
}
|
||||
|
||||
size_t ProcessMetrics::GetWorkingSetSize() const {
|
||||
@ -88,7 +90,7 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.2 2015/05/06 14:27:2
|
||||
}
|
||||
|
||||
size_t ProcessMetrics::GetPeakWorkingSetSize() const {
|
||||
@@ -89,20 +115,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
|
||||
@@ -92,20 +118,27 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
|
||||
}
|
||||
|
||||
static int GetProcessCPU(pid_t pid) {
|
||||
@ -120,10 +122,10 @@ $OpenBSD: patch-base_process_process_metrics_openbsd_cc,v 1.2 2015/05/06 14:27:2
|
||||
}
|
||||
|
||||
double ProcessMetrics::GetCPUUsage() {
|
||||
@@ -116,7 +149,6 @@ double ProcessMetrics::GetCPUUsage() {
|
||||
@@ -119,7 +152,6 @@ double ProcessMetrics::GetCPUUsage() {
|
||||
}
|
||||
|
||||
int64 time_delta = (time - last_cpu_time_).InMicroseconds();
|
||||
int64_t time_delta = (time - last_cpu_time_).InMicroseconds();
|
||||
- DCHECK_NE(time_delta, 0);
|
||||
|
||||
if (time_delta == 0)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_process_process_posix_cc,v 1.5 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/process/process_posix.cc.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ base/process/process_posix.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -17,9 +17,13 @@
|
||||
$OpenBSD: patch-base_process_process_posix_cc,v 1.6 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/process/process_posix.cc.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ base/process/process_posix.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -19,9 +19,13 @@
|
||||
#if defined(OS_MACOSX)
|
||||
#include <sys/event.h>
|
||||
#endif
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-base_strings_safe_sprintf_cc,v 1.3 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/strings/safe_sprintf.cc.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ base/strings/safe_sprintf.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -118,7 +118,7 @@ class Buffer {
|
||||
// doesn't really implement constexpr yet so it doesn't complain, but clang
|
||||
// does.
|
||||
#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \
|
||||
- !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN))
|
||||
+ !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN)) && !defined(OS_BSD)
|
||||
COMPILE_ASSERT(kSSizeMaxConst == \
|
||||
static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
|
||||
kSSizeMax_is_the_max_value_of_an_ssize_t);
|
@ -1,28 +1,28 @@
|
||||
$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.4 2016/01/07 07:26:40 robert Exp $
|
||||
--- base/sys_info_openbsd.cc.orig.port Tue Dec 15 21:05:04 2015
|
||||
+++ base/sys_info_openbsd.cc Sun Jan 3 22:19:58 2016
|
||||
@@ -26,6 +26,8 @@ int64 AmountOfMemory(int pages_name) {
|
||||
$OpenBSD: patch-base_sys_info_openbsd_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/sys_info_openbsd.cc.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ base/sys_info_openbsd.cc Sat Mar 5 23:38:02 2016
|
||||
@@ -29,6 +29,8 @@ int64_t AmountOfMemory(int pages_name) {
|
||||
|
||||
namespace base {
|
||||
|
||||
+int64 aofpmem = 0;
|
||||
+int64_t aofpmem = 0;
|
||||
+
|
||||
// static
|
||||
int SysInfo::NumberOfProcessors() {
|
||||
int mib[] = { CTL_HW, HW_NCPU };
|
||||
@@ -40,12 +42,11 @@ int SysInfo::NumberOfProcessors() {
|
||||
@@ -43,12 +45,10 @@ int SysInfo::NumberOfProcessors() {
|
||||
|
||||
// static
|
||||
int64 SysInfo::AmountOfPhysicalMemory() {
|
||||
int64_t SysInfo::AmountOfPhysicalMemory() {
|
||||
- return AmountOfMemory(_SC_PHYS_PAGES);
|
||||
-}
|
||||
-
|
||||
-// static
|
||||
-int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
|
||||
- return AmountOfMemory(_SC_AVPHYS_PAGES);
|
||||
+ // pledge(2)
|
||||
+ if (!aofpmem)
|
||||
+ aofpmem = AmountOfMemory(_SC_PHYS_PAGES);
|
||||
|
||||
-// static
|
||||
-int64 SysInfo::AmountOfAvailablePhysicalMemory() {
|
||||
- return AmountOfMemory(_SC_AVPHYS_PAGES);
|
||||
+ return aofpmem;
|
||||
}
|
||||
|
||||
|
@ -1,21 +1,21 @@
|
||||
$OpenBSD: patch-base_sys_info_posix_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- base/sys_info_posix.cc.orig.port Wed Nov 19 05:52:58 2014
|
||||
+++ base/sys_info_posix.cc Wed Nov 19 08:38:24 2014
|
||||
@@ -87,6 +87,17 @@ int64 SysInfo::AmountOfVirtualMemory() {
|
||||
$OpenBSD: patch-base_sys_info_posix_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/sys_info_posix.cc.orig.port Thu Mar 3 09:54:05 2016
|
||||
+++ base/sys_info_posix.cc Thu Mar 3 11:01:40 2016
|
||||
@@ -89,6 +89,17 @@ int64_t SysInfo::AmountOfVirtualMemory() {
|
||||
}
|
||||
|
||||
// static
|
||||
+int64 SysInfo::AmountOfAvailablePhysicalMemory() {
|
||||
+int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
|
||||
+ long available_pages = sysconf(_SC_AVPHYS_PAGES);
|
||||
+ long page_size = sysconf(_SC_PAGE_SIZE);
|
||||
+ if (available_pages == -1 || page_size == -1) {
|
||||
+ NOTREACHED();
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return static_cast<int64>(available_pages) * page_size;
|
||||
+ return static_cast<int64_t>(available_pages) * page_size;
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
int64 SysInfo::AmountOfFreeDiskSpace(const FilePath& path) {
|
||||
int64_t SysInfo::AmountOfFreeDiskSpace(const FilePath& path) {
|
||||
base::ThreadRestrictions::AssertIOAllowed();
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.5 2015/10/24 18:22:21 robert Exp $
|
||||
--- base/threading/platform_thread_linux.cc.orig.port Wed Oct 7 04:42:07 2015
|
||||
+++ base/threading/platform_thread_linux.cc Wed Oct 14 07:41:12 2015
|
||||
@@ -15,7 +15,9 @@
|
||||
$OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.6 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/threading/platform_thread_linux.cc.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/threading/platform_thread_linux.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -17,7 +17,9 @@
|
||||
|
||||
#if !defined(OS_NACL)
|
||||
#include <pthread.h>
|
||||
@ -11,7 +11,7 @@ $OpenBSD: patch-base_threading_platform_thread_linux_cc,v 1.5 2015/10/24 18:22:2
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
@@ -79,7 +81,7 @@ void PlatformThread::SetName(const std::string& name)
|
||||
@@ -81,7 +83,7 @@ void PlatformThread::SetName(const std::string& name)
|
||||
ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
|
||||
tracked_objects::ThreadData::InitializeThreadContext(name);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-base_trace_event_process_memory_dump_h,v 1.1 2016/02/15 18:07:52 robert Exp $
|
||||
--- base/trace_event/process_memory_dump.h.orig.port Fri Jan 22 23:16:20 2016
|
||||
+++ base/trace_event/process_memory_dump.h Fri Jan 22 23:16:29 2016
|
||||
@@ -22,7 +22,7 @@
|
||||
$OpenBSD: patch-base_trace_event_process_memory_dump_h,v 1.2 2016/03/23 20:13:06 robert Exp $
|
||||
--- base/trace_event/process_memory_dump.h.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ base/trace_event/process_memory_dump.h Thu Mar 3 09:43:25 2016
|
||||
@@ -26,7 +26,7 @@
|
||||
// resident memory.
|
||||
// TODO(crbug.com/542671): COUNT_RESIDENT_BYTES_SUPPORTED is disabled on iOS
|
||||
// as it cause memory corruption on iOS 9.0+ devices.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-build_all_gyp,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- build/all.gyp.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ build/all.gyp Fri Jan 22 19:58:58 2016
|
||||
@@ -352,7 +352,6 @@
|
||||
$OpenBSD: patch-build_all_gyp,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- build/all.gyp.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ build/all.gyp Thu Mar 3 09:43:25 2016
|
||||
@@ -361,7 +361,6 @@
|
||||
'../media/midi/midi.gyp:midi_unittests',
|
||||
'../mojo/mojo.gyp:mojo',
|
||||
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- build/common.gypi.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ build/common.gypi Fri Jan 22 19:58:58 2016
|
||||
@@ -105,7 +105,7 @@
|
||||
$OpenBSD: patch-build_common_gypi,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- build/common.gypi.orig.port Wed Feb 24 21:01:30 2016
|
||||
+++ build/common.gypi Thu Mar 3 17:37:31 2016
|
||||
@@ -112,7 +112,7 @@
|
||||
|
||||
'conditions': [
|
||||
# Windows and Linux (including Chrome OS) use Aura and Ash.
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'use_ash%': 1,
|
||||
'use_aura%': 1,
|
||||
}],
|
||||
@@ -229,12 +229,12 @@
|
||||
@@ -249,12 +249,12 @@
|
||||
}],
|
||||
|
||||
# Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS).
|
||||
@ -25,7 +25,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'enable_topchrome_md%': 1,
|
||||
}],
|
||||
|
||||
@@ -761,7 +761,7 @@
|
||||
@@ -784,7 +784,7 @@
|
||||
}],
|
||||
|
||||
# DBus usage.
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'use_dbus%': 1,
|
||||
}, {
|
||||
'use_dbus%': 0,
|
||||
@@ -868,7 +868,7 @@
|
||||
@@ -889,7 +889,7 @@
|
||||
|
||||
# Use GPU accelerated cross process image transport by default
|
||||
# on linux builds with the Aura window manager
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'ui_compositor_image_transport%': 1,
|
||||
}, {
|
||||
'ui_compositor_image_transport%': 0,
|
||||
@@ -974,7 +974,7 @@
|
||||
@@ -995,7 +995,7 @@
|
||||
# --help for more information. Meant to be overriden with GYP_DEFINES.
|
||||
# TODO(maruel): Remove the conditions as more configurations are
|
||||
# supported.
|
||||
@ -52,7 +52,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'test_isolation_mode%': 'check',
|
||||
}, {
|
||||
'test_isolation_mode%': 'noop',
|
||||
@@ -990,7 +990,7 @@
|
||||
@@ -1011,7 +1011,7 @@
|
||||
}, {
|
||||
'use_openmax_dl_fft%': 0,
|
||||
}],
|
||||
@ -61,7 +61,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'enable_mdns%' : 1,
|
||||
}],
|
||||
|
||||
@@ -1617,7 +1617,7 @@
|
||||
@@ -1636,7 +1636,7 @@
|
||||
['OS=="win"', {
|
||||
'windows_driver_kit_path%': '$(WDK_DIR)',
|
||||
}],
|
||||
@ -70,7 +70,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'conditions': [
|
||||
['target_arch=="mipsel" or target_arch=="mips64el"', {
|
||||
'werror%': '',
|
||||
@@ -3609,6 +3609,13 @@
|
||||
@@ -3613,6 +3613,13 @@
|
||||
},
|
||||
},
|
||||
'conditions': [
|
||||
@ -84,7 +84,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
['os_posix==1', {
|
||||
'target_defaults': {
|
||||
'ldflags': [
|
||||
@@ -4695,7 +4702,7 @@
|
||||
@@ -4735,7 +4742,7 @@
|
||||
}],
|
||||
# FreeBSD-specific options; note that most FreeBSD options are set above,
|
||||
# with Linux.
|
||||
@ -93,7 +93,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
'target_defaults': {
|
||||
'ldflags': [
|
||||
'-Wl,--no-keep-memory',
|
||||
@@ -5980,8 +5987,8 @@
|
||||
@@ -6031,8 +6038,8 @@
|
||||
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
|
||||
'and OS!="win"', {
|
||||
'make_global_settings': [
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_main_cc,v 1.2 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/app/chrome_main.cc.orig.port Sun Dec 20 19:33:32 2015
|
||||
+++ chrome/app/chrome_main.cc Wed Feb 10 07:55:35 2016
|
||||
$OpenBSD: patch-chrome_app_chrome_main_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/app/chrome_main.cc.orig.port Mon Mar 21 19:53:19 2016
|
||||
+++ chrome/app/chrome_main.cc Wed Mar 23 12:37:29 2016
|
||||
@@ -3,6 +3,8 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
@ -8,9 +8,9 @@ $OpenBSD: patch-chrome_app_chrome_main_cc,v 1.2 2016/02/15 18:07:52 robert Exp $
|
||||
+#include "base/command_line.h"
|
||||
+#include "content/public/common/content_switches.h"
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "content/public/app/content_main.h"
|
||||
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
|
||||
@@ -32,7 +34,11 @@ int ChromeMain(int argc, const char** argv);
|
||||
@@ -33,7 +35,11 @@ int ChromeMain(int argc, const char** argv);
|
||||
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
|
||||
static void trace_url_request(const std::string &caller, const GURL &url)
|
||||
{
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.cc.orig.port Wed Jan 20 21:01:18 2016
|
||||
+++ chrome/app/chrome_main_delegate.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -76,7 +76,7 @@
|
||||
#include "components/crash/content/app/crash_reporter_client.h"
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.cc.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ chrome/app/chrome_main_delegate.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -81,7 +81,7 @@
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
-#if !defined(DISABLE_NACL) && defined(OS_LINUX)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
#include "components/nacl/common/nacl_paths.h"
|
||||
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
|
||||
#endif
|
||||
@@ -107,7 +107,7 @@
|
||||
@@ -116,7 +116,7 @@
|
||||
#include "components/crash/content/app/breakpad_linux.h"
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
#include "base/environment.h"
|
||||
#endif
|
||||
|
||||
@@ -145,7 +145,7 @@ base::LazyInstance<ChromeContentBrowserClient> g_chrom
|
||||
@@ -154,7 +154,7 @@ base::LazyInstance<ChromeContentBrowserClient> g_chrom
|
||||
LAZY_INSTANCE_INITIALIZER;
|
||||
#endif
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
|
||||
LAZY_INSTANCE_INITIALIZER;
|
||||
#endif
|
||||
@@ -252,7 +252,7 @@ bool SubprocessNeedsResourceBundle(const std::string&
|
||||
@@ -277,7 +277,7 @@ bool SubprocessNeedsResourceBundle(const std::string&
|
||||
// Mac needs them for the plugin process name.
|
||||
process_type == switches::kPluginProcess ||
|
||||
#endif
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
// The zygote process opens the resources for the renderers.
|
||||
process_type == switches::kZygoteProcess ||
|
||||
#endif
|
||||
@@ -304,7 +304,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
@@ -329,7 +329,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
void SIGTERMProfilingShutdown(int signal) {
|
||||
Profiling::Stop();
|
||||
struct sigaction sigact;
|
||||
@@ -338,7 +338,7 @@ void InitializeUserDataDir() {
|
||||
@@ -363,7 +363,7 @@ void InitializeUserDataDir() {
|
||||
std::string process_type =
|
||||
command_line->GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
// On Linux, Chrome does not support running multiple copies under different
|
||||
// DISPLAYs, so the profile directory can be specified in the environment to
|
||||
// support the virtual desktop use-case.
|
||||
@@ -665,7 +665,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -693,7 +693,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
std::string process_type =
|
||||
command_line.GetSwitchValueASCII(switches::kProcessType);
|
||||
|
||||
@ -64,7 +64,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
|
||||
#endif
|
||||
|
||||
@@ -786,7 +786,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
@@ -814,7 +814,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||
chrome::InitializePDF();
|
||||
#endif
|
||||
|
||||
@ -73,7 +73,7 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||
if (process_type != switches::kZygoteProcess) {
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -910,7 +910,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
|
||||
@@ -942,7 +942,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
|
||||
#endif
|
||||
return process_type == switches::kRelauncherProcess;
|
||||
}
|
||||
@ -81,4 +81,4 @@ $OpenBSD: patch-chrome_app_chrome_main_delegate_cc,v 1.7 2016/02/15 18:07:52 rob
|
||||
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
||||
void ChromeMainDelegate::ZygoteStarting(
|
||||
ScopedVector<content::ZygoteForkDelegate>* delegates) {
|
||||
#if !defined(DISABLE_NACL)
|
||||
#if defined(OS_CHROMEOS)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.h.orig.port Wed Apr 15 00:31:21 2015
|
||||
+++ chrome/app/chrome_main_delegate.h Wed Apr 15 08:32:50 2015
|
||||
@@ -36,7 +36,7 @@ class ChromeMainDelegate : public content::ContentMain
|
||||
$OpenBSD: patch-chrome_app_chrome_main_delegate_h,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/app/chrome_main_delegate.h.orig.port Wed Feb 24 00:01:57 2016
|
||||
+++ chrome/app/chrome_main_delegate.h Thu Mar 3 09:43:25 2016
|
||||
@@ -38,7 +38,7 @@ class ChromeMainDelegate : public content::ContentMain
|
||||
const std::string& process_type) override;
|
||||
bool ShouldSendMachPort(const std::string& process_type) override;
|
||||
bool DelaySandboxInitialization(const std::string& process_type) override;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.8 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/app/chromium_strings.grd.orig.port Mon Feb 15 09:22:56 2016
|
||||
+++ chrome/app/chromium_strings.grd Mon Feb 15 12:12:51 2016
|
||||
@@ -1014,7 +1014,7 @@ Signing in anyway will merge Iridium information like
|
||||
$OpenBSD: patch-chrome_app_chromium_strings_grd,v 1.9 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/app/chromium_strings.grd.orig.port Mon Mar 21 19:53:15 2016
|
||||
+++ chrome/app/chromium_strings.grd Wed Mar 23 12:37:29 2016
|
||||
@@ -965,7 +965,7 @@ Signing in anyway will merge Iridium information like
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
|
12
www/iridium/patches/patch-chrome_app_generated_resources_grd
Normal file
12
www/iridium/patches/patch-chrome_app_generated_resources_grd
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-chrome_app_generated_resources_grd,v 1.1 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/app/generated_resources.grd.orig.port Sat Mar 5 23:14:52 2016
|
||||
+++ chrome/app/generated_resources.grd Sat Mar 5 23:15:28 2016
|
||||
@@ -6566,7 +6566,7 @@ Keep your key file in a safe place. You will need it t
|
||||
<message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
|
||||
Right-to-left
|
||||
</message>
|
||||
- <if expr="is_win or is_linux">
|
||||
+ <if expr="is_win or is_linux or is_posix">
|
||||
<message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
|
||||
Enable Input IME API
|
||||
</message>
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/app/google_chrome_strings.grd.orig.port Mon Feb 15 07:30:04 2016
|
||||
+++ chrome/app/google_chrome_strings.grd Mon Feb 15 12:12:51 2016
|
||||
@@ -1015,7 +1015,7 @@ Signing in anyway will merge Chrome information like b
|
||||
$OpenBSD: patch-chrome_app_google_chrome_strings_grd,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/app/google_chrome_strings.grd.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/app/google_chrome_strings.grd Wed Mar 23 12:37:29 2016
|
||||
@@ -966,7 +966,7 @@ Signing in anyway will merge Chrome information like b
|
||||
</message>
|
||||
|
||||
<!-- ProcessSingleton -->
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-chrome_app_theme_theme_resources_grd,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/app/theme/theme_resources.grd.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/app/theme/theme_resources.grd Fri Jan 22 19:58:58 2016
|
||||
@@ -472,7 +472,7 @@
|
||||
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW" file="cros/notification_peripheral_battery_low.png" />
|
||||
<structure type="chrome_scaled_image" name="IDR_PORTAL_DETECTION_ALERT" file="cros/captive_portal_icon.png" />
|
||||
</if>
|
||||
- <if expr="is_win or desktop_linux">
|
||||
+ <if expr="is_win or desktop_linux or is_posix">
|
||||
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_ATTENTION" file="common/notification_tray_do_not_disturb_attention.png" />
|
||||
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_EMPTY" file="common/notification_tray_do_not_disturb_empty.png" />
|
||||
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_ATTENTION" file="common/notification_tray_attention.png" />
|
@ -1,17 +1,17 @@
|
||||
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/about_flags.cc.orig.port Mon Feb 15 07:30:05 2016
|
||||
+++ chrome/browser/about_flags.cc Mon Feb 15 12:12:51 2016
|
||||
@@ -755,7 +755,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
// On by default for the Mac (different implementation in WebKit).
|
||||
kOsLinux | kOsWin,
|
||||
SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)},
|
||||
$OpenBSD: patch-chrome_browser_about_flags_cc,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/about_flags.cc.orig.port Wed Mar 23 13:05:39 2016
|
||||
+++ chrome/browser/about_flags.cc Wed Mar 23 13:06:02 2016
|
||||
@@ -684,7 +684,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
// Mac has a separate implementation with its own setting to disable.
|
||||
kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
|
||||
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableSmoothScrolling)},
|
||||
-#if defined(USE_AURA) || defined(OS_LINUX)
|
||||
+#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
{"overlay-scrollbars",
|
||||
IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_NAME,
|
||||
IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_DESCRIPTION,
|
||||
@@ -877,7 +877,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
SINGLE_VALUE_TYPE(switches::kEnableSpellingAutoCorrect)},
|
||||
IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
|
||||
IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
|
||||
@@ -795,7 +795,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
SINGLE_VALUE_TYPE(switches::kEnableAndroidSpellChecker)},
|
||||
#endif
|
||||
#if defined(ENABLE_SPELLCHECK) && \
|
||||
- (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS))
|
||||
@ -19,3 +19,12 @@ $OpenBSD: patch-chrome_browser_about_flags_cc,v 1.7 2016/02/15 18:07:52 robert E
|
||||
{"enable-multilingual-spellchecker",
|
||||
IDS_FLAGS_ENABLE_MULTILINGUAL_SPELLCHECKER_NAME,
|
||||
IDS_FLAGS_ENABLE_MULTILINGUAL_SPELLCHECKER_DESCRIPTION,
|
||||
@@ -2083,7 +2083,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kOsDesktop,
|
||||
SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)},
|
||||
#endif
|
||||
-#if defined(OS_WIN) || defined(OS_LINUX)
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
{"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
|
||||
IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION,
|
||||
kOsWin | kOsLinux,
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.1 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/after_startup_task_utils.cc.orig.port Thu Sep 24 12:59:35 2015
|
||||
+++ chrome/browser/after_startup_task_utils.cc Thu Sep 24 13:01:01 2015
|
||||
@@ -89,7 +89,7 @@ void QueueTask(scoped_ptr<AfterStartupTask> queued_tas
|
||||
$OpenBSD: patch-chrome_browser_after_startup_task_utils_cc,v 1.2 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/after_startup_task_utils.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/after_startup_task_utils.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -93,7 +93,7 @@ void QueueTask(scoped_ptr<AfterStartupTask> queued_tas
|
||||
|
||||
void SetBrowserStartupIsComplete() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.7 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/browser_resources.grd.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/browser_resources.grd Fri Jan 22 19:58:58 2016
|
||||
@@ -259,7 +259,7 @@
|
||||
$OpenBSD: patch-chrome_browser_browser_resources_grd,v 1.8 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/browser_resources.grd.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/browser_resources.grd Thu Mar 3 09:43:25 2016
|
||||
@@ -279,7 +279,7 @@
|
||||
<include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
|
||||
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
|
||||
</if>
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.3 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main.cc.orig.port Mon Feb 15 09:23:02 2016
|
||||
+++ chrome/browser/chrome_browser_main.cc Mon Feb 15 12:12:51 2016
|
||||
@@ -161,7 +161,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main.cc.orig.port Mon Mar 21 19:53:22 2016
|
||||
+++ chrome/browser/chrome_browser_main.cc Wed Mar 23 12:37:29 2016
|
||||
@@ -166,7 +166,7 @@
|
||||
#include "chrome/browser/feedback/feedback_profile_observer.h"
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.3 2016/02/15 18:07:52
|
||||
#include "chrome/browser/first_run/upgrade_util_linux.h"
|
||||
#include "chrome/browser/sxs_linux.h"
|
||||
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
@@ -1050,7 +1050,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
||||
}
|
||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_cc,v 1.3 2016/02/15 18:07:52
|
||||
// Set the product channel for crash reports.
|
||||
base::debug::SetCrashKeyValue(crash_keys::kChannel,
|
||||
chrome::GetChannelString());
|
||||
@@ -1402,7 +1402,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
@@ -1414,7 +1414,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
|
||||
return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS;
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.2 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main_linux.cc.orig.port Sun Jan 31 17:46:49 2016
|
||||
+++ chrome/browser/chrome_browser_main_linux.cc Sat Jan 30 18:45:46 2016
|
||||
@@ -61,12 +61,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main_linux.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/chrome_browser_main_linux.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -62,12 +62,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
|
||||
void ChromeBrowserMainPartsLinux::PostProfileInit() {
|
||||
ChromeBrowserMainPartsPosix::PostProfileInit();
|
||||
|
||||
@ -17,7 +17,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_linux_cc,v 1.2 2016/02/15 18:
|
||||
bluez::DBusThreadManagerLinux::Initialize();
|
||||
bluez::BluezDBusManager::Initialize(
|
||||
bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
|
||||
@@ -76,7 +78,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
|
||||
@@ -77,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
|
||||
}
|
||||
|
||||
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main_posix.cc.orig.port Wed Sep 10 22:14:04 2014
|
||||
+++ chrome/browser/chrome_browser_main_posix.cc Wed Sep 10 22:14:59 2014
|
||||
@@ -270,6 +270,11 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
|
||||
$OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.3 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/chrome_browser_main_posix.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/chrome_browser_main_posix.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
|
||||
g_pipe_pid = getpid();
|
||||
g_shutdown_pipe_read_fd = pipefd[0];
|
||||
g_shutdown_pipe_write_fd = pipefd[1];
|
||||
@ -13,7 +13,7 @@ $OpenBSD: patch-chrome_browser_chrome_browser_main_posix_cc,v 1.2 2015/05/06 14:
|
||||
#if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
|
||||
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
||||
#else
|
||||
@@ -277,6 +282,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
|
||||
@@ -281,6 +286,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
|
||||
// shadow stacks) bloat the stack frames, so we need to increase the stack
|
||||
// size to avoid hitting the guard page.
|
||||
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.8 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig.port Wed Jan 27 18:00:44 2016
|
||||
+++ chrome/browser/chrome_content_browser_client.cc Fri Jan 29 17:39:15 2016
|
||||
@@ -178,7 +178,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.9 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/chrome_content_browser_client.cc.orig.port Thu Feb 25 03:02:29 2016
|
||||
+++ chrome/browser/chrome_content_browser_client.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -187,7 +187,7 @@
|
||||
#include "chrome/browser/chromeos/system/input_device_settings.h"
|
||||
#include "chromeos/chromeos_switches.h"
|
||||
#include "components/user_manager/user_manager.h"
|
||||
@ -9,8 +9,8 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.8 2016/02/15
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
#include "chrome/browser/chrome_browser_main_linux.h"
|
||||
#elif defined(OS_ANDROID)
|
||||
#include "chrome/browser/android/new_tab_page_url_handler.h"
|
||||
@@ -193,7 +193,7 @@
|
||||
#include "chrome/browser/chrome_browser_main_android.h"
|
||||
@@ -200,7 +200,7 @@
|
||||
#include "chrome/browser/chrome_browser_main_posix.h"
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.8 2016/02/15
|
||||
#include "base/debug/leak_annotations.h"
|
||||
#include "components/crash/content/app/breakpad_linux.h"
|
||||
#include "components/crash/content/browser/crash_handler_host_linux.h"
|
||||
@@ -464,7 +464,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
|
||||
@@ -486,7 +486,7 @@ bool CertMatchesFilter(const net::X509Certificate& cer
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.8 2016/02/15
|
||||
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
|
||||
const std::string& process_type) {
|
||||
base::FilePath dumps_path;
|
||||
@@ -721,7 +721,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
|
||||
@@ -766,7 +766,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
|
||||
main_parts = new ChromeBrowserMainPartsMac(parameters);
|
||||
#elif defined(OS_CHROMEOS)
|
||||
main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.8 2016/02/15
|
||||
main_parts = new ChromeBrowserMainPartsLinux(parameters);
|
||||
#elif defined(OS_ANDROID)
|
||||
main_parts = new ChromeBrowserMainPartsAndroid(parameters);
|
||||
@@ -1371,7 +1371,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
@@ -1405,7 +1405,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_browser_chrome_content_browser_client_cc,v 1.8 2016/02/15
|
||||
if (breakpad::IsCrashReporterEnabled()) {
|
||||
scoped_ptr<metrics::ClientInfo> client_info =
|
||||
GoogleUpdateSettings::LoadMetricsClientInfo();
|
||||
@@ -2498,7 +2498,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
|
||||
@@ -2559,7 +2559,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
|
||||
PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
|
||||
DCHECK(!app_data_path.empty());
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.6 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/chrome_content_browser_client.h Fri Jan 22 19:58:58 2016
|
||||
@@ -264,7 +264,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
$OpenBSD: patch-chrome_browser_chrome_content_browser_client_h,v 1.7 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/chrome_content_browser_client.h.orig.port Thu Feb 25 03:02:29 2016
|
||||
+++ chrome/browser/chrome_content_browser_client.h Thu Mar 3 09:43:25 2016
|
||||
@@ -268,7 +268,7 @@ class ChromeContentBrowserClient : public content::Con
|
||||
int child_process_id,
|
||||
content::FileDescriptorInfo* mappings,
|
||||
std::map<int, base::MemoryMappedFile::Region>* regions) override;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.3 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig.port Fri Nov 13 12:04:14 2015
|
||||
+++ chrome/browser/custom_handlers/protocol_handler_registry.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -42,7 +42,7 @@ const ProtocolHandler& LookupHandler(
|
||||
$OpenBSD: patch-chrome_browser_custom_handlers_protocol_handler_registry_cc,v 1.4 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/custom_handlers/protocol_handler_registry.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -46,7 +46,7 @@ const ProtocolHandler& LookupHandler(
|
||||
// If true default protocol handlers will be removed if the OS level
|
||||
// registration for a protocol is no longer Chrome.
|
||||
bool ShouldRemoveHandlersNotInOS() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_defaults_cc,v 1.4 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/defaults.cc.orig.port Fri Nov 13 12:04:14 2015
|
||||
+++ chrome/browser/defaults.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -45,7 +45,7 @@ const bool kSyncAutoStarts = false;
|
||||
$OpenBSD: patch-chrome_browser_defaults_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/defaults.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/defaults.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;
|
||||
const bool kShowOtherBrowsersInAboutMemory = true;
|
||||
#endif
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.4 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Mon Feb 15 07:30:05 2016
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc Mon Feb 15 12:12:52 2016
|
||||
@@ -740,7 +740,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
$OpenBSD: patch-chrome_browser_download_chrome_download_manager_delegate_cc,v 1.5 2016/03/23 20:13:06 robert Exp $
|
||||
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/download/chrome_download_manager_delegate.cc Wed Mar 23 12:37:29 2016
|
||||
@@ -752,7 +752,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
|
||||
|
||||
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
|
||||
const base::FilePath& path) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.3 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/download/download_commands.cc.orig.port Wed Oct 7 04:42:08 2015
|
||||
+++ chrome/browser/download/download_commands.cc Wed Oct 14 07:41:13 2015
|
||||
@@ -115,7 +115,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/download/download_commands.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/download/download_commands.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -211,7 +211,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
|
||||
download_crx_util::IsExtensionDownload(*download_item_);
|
||||
case ALWAYS_OPEN_TYPE:
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || \
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.3 2015/10/24 18
|
||||
if (CanOpenPdfInSystemViewer()) {
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
|
||||
download_item_->GetBrowserContext());
|
||||
@@ -158,7 +158,7 @@ void DownloadCommands::ExecuteCommand(Command command)
|
||||
@@ -255,7 +255,7 @@ void DownloadCommands::ExecuteCommand(Command command)
|
||||
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
|
||||
download_item_->GetBrowserContext());
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || \
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.3 2015/10/24 18
|
||||
if (CanOpenPdfInSystemViewer()) {
|
||||
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
|
||||
DownloadItemModel(download_item_)
|
||||
@@ -225,7 +225,7 @@ Browser* DownloadCommands::GetBrowser() const {
|
||||
@@ -325,7 +325,7 @@ Browser* DownloadCommands::GetBrowser() const {
|
||||
return browser_displayer.browser();
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_commands_cc,v 1.3 2015/10/24 18
|
||||
bool DownloadCommands::IsDownloadPdf() const {
|
||||
base::FilePath path = download_item_->GetTargetFilePath();
|
||||
return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
|
||||
@@ -242,7 +242,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
|
||||
@@ -342,7 +342,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
|
||||
return IsDownloadPdf() &&
|
||||
(IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
|
||||
: true);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.2 2015/08/12 10:56:13 robert Exp $
|
||||
--- chrome/browser/download/download_commands.h.orig.port Wed Jul 15 22:29:57 2015
|
||||
+++ chrome/browser/download/download_commands.h Wed Jul 22 08:37:29 2015
|
||||
@@ -40,7 +40,7 @@ class DownloadCommands {
|
||||
$OpenBSD: patch-chrome_browser_download_download_commands_h,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/download/download_commands.h.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/download/download_commands.h Thu Mar 3 09:43:25 2016
|
||||
@@ -42,7 +42,7 @@ class DownloadCommands {
|
||||
void ExecuteCommand(Command command);
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_LINUX) || \
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56:13 robert Exp $
|
||||
--- chrome/browser/download/download_prefs.cc.orig.port Wed Jul 22 08:42:28 2015
|
||||
+++ chrome/browser/download/download_prefs.cc Wed Jul 22 08:43:46 2015
|
||||
@@ -51,7 +51,7 @@ namespace {
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/download/download_prefs.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/download/download_prefs.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -55,7 +55,7 @@ namespace {
|
||||
// Consider downloads 'dangerous' if they go to the home directory on Linux and
|
||||
// to the desktop on any platform.
|
||||
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56
|
||||
base::FilePath home_dir = base::GetHomeDir();
|
||||
if (download_path == home_dir) {
|
||||
return true;
|
||||
@@ -131,7 +131,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
|
||||
@@ -135,7 +135,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
|
||||
GetDefaultDownloadDirectoryForProfile()));
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56
|
||||
(defined(OS_MACOSX) && !defined(OS_IOS))
|
||||
should_open_pdf_in_system_reader_ =
|
||||
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
|
||||
@@ -208,7 +208,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
||||
@@ -212,7 +212,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
||||
default_download_path);
|
||||
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
|
||||
default_download_path);
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56
|
||||
(defined(OS_MACOSX) && !defined(OS_IOS))
|
||||
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
|
||||
#endif
|
||||
@@ -286,7 +286,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
|
||||
@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
|
||||
}
|
||||
|
||||
bool DownloadPrefs::IsAutoOpenUsed() const {
|
||||
@ -37,7 +37,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56
|
||||
(defined(OS_MACOSX) && !defined(OS_IOS))
|
||||
if (ShouldOpenPdfInSystemReader())
|
||||
return true;
|
||||
@@ -301,7 +301,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
|
||||
@@ -305,7 +305,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
|
||||
return false;
|
||||
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
|
||||
extension.erase(0, 1);
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56
|
||||
(defined(OS_MACOSX) && !defined(OS_IOS))
|
||||
if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
|
||||
return true;
|
||||
@@ -335,7 +335,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
|
||||
@@ -339,7 +339,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
|
||||
SaveAutoOpenState();
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_cc,v 1.3 2015/08/12 10:56
|
||||
(defined(OS_MACOSX) && !defined(OS_IOS))
|
||||
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
|
||||
if (should_open_pdf_in_system_reader_ == should_open)
|
||||
@@ -357,7 +357,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
||||
@@ -361,7 +361,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
||||
#endif
|
||||
|
||||
void DownloadPrefs::ResetAutoOpen() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.3 2015/08/12 10:56:13 robert Exp $
|
||||
--- chrome/browser/download/download_prefs.h.orig.port Wed Jul 15 22:29:57 2015
|
||||
+++ chrome/browser/download/download_prefs.h Wed Jul 22 08:37:29 2015
|
||||
@@ -77,7 +77,7 @@ class DownloadPrefs {
|
||||
$OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/download/download_prefs.h.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/download/download_prefs.h Thu Mar 3 09:43:25 2016
|
||||
@@ -79,7 +79,7 @@ class DownloadPrefs {
|
||||
// Disables auto-open based on file extension.
|
||||
void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_download_download_prefs_h,v 1.3 2015/08/12 10:56:
|
||||
(defined(OS_MACOSX) && !defined(OS_IOS))
|
||||
// Store the user preference to disk. If |should_open| is true, also disable
|
||||
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
|
||||
@@ -109,7 +109,7 @@ class DownloadPrefs {
|
||||
@@ -111,7 +111,7 @@ class DownloadPrefs {
|
||||
AutoOpenCompareFunctor> AutoOpenSet;
|
||||
AutoOpenSet auto_open_;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.3 2015/05/26 17:37:39 robert Exp $
|
||||
--- chrome/browser/download/download_shelf_context_menu.cc.orig.port Wed May 20 10:02:47 2015
|
||||
+++ chrome/browser/download/download_shelf_context_menu.cc Wed May 20 10:03:00 2015
|
||||
@@ -143,7 +143,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
|
||||
$OpenBSD: patch-chrome_browser_download_download_shelf_context_menu_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/download/download_shelf_context_menu.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/download/download_shelf_context_menu.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
|
||||
: IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
|
||||
break;
|
||||
}
|
||||
|
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/download/download_status_updater.cc.orig.port Sat Jul 19 03:32:36 2014
|
||||
+++ chrome/browser/download/download_status_updater.cc Sat Jul 19 03:33:37 2014
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "base/logging.h"
|
||||
$OpenBSD: patch-chrome_browser_download_download_status_updater_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/download/download_status_updater.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/download/download_status_updater.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "base/stl_util.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(
|
||||
@@ -140,7 +140,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(
|
||||
#if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
|
||||
void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
|
||||
content::DownloadItem* download) {
|
||||
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_input_ime_input_ime_api_h,v 1.1 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig.port Sat Mar 5 23:25:17 2016
|
||||
+++ chrome/browser/extensions/api/input_ime/input_ime_api.h Sat Mar 5 23:25:23 2016
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#if defined(OS_CHROMEOS)
|
||||
#include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"
|
||||
-#elif defined(OS_LINUX) || defined(OS_WIN)
|
||||
+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
|
||||
#include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h"
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.3 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/extensions/api/messaging/message_service.cc.orig.port Fri Nov 13 12:04:14 2015
|
||||
+++ chrome/browser/extensions/api/messaging/message_service.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -113,7 +113,7 @@ MessageService::PolicyPermission MessageService::IsNat
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/extensions/api/messaging/message_service.cc.orig.port Thu Mar 3 10:02:04 2016
|
||||
+++ chrome/browser/extensions/api/messaging/message_service.cc Thu Mar 3 10:02:19 2016
|
||||
@@ -118,7 +118,7 @@ MessageService::PolicyPermission MessageService::IsNat
|
||||
|
||||
const char kReceivingEndDoesntExistError[] =
|
||||
"Could not establish connection. Receiving end does not exist.";
|
||||
@ -10,12 +10,12 @@ $OpenBSD: patch-chrome_browser_extensions_api_messaging_message_service_cc,v 1.3
|
||||
const char kMissingPermissionError[] =
|
||||
"Access to native messaging requires nativeMessaging permission.";
|
||||
const char kProhibitedByPoliciesError[] =
|
||||
@@ -422,7 +422,7 @@ void MessageService::OpenChannelToNativeApp(
|
||||
@@ -413,7 +413,7 @@ void MessageService::OpenChannelToNativeApp(
|
||||
if (!source)
|
||||
return;
|
||||
|
||||
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
|
||||
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
Profile* profile = Profile::FromBrowserContext(source->GetBrowserContext());
|
||||
Profile* profile =
|
||||
Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext());
|
||||
ExtensionService* extension_service =
|
||||
ExtensionSystem::Get(profile)->extension_service();
|
||||
|
@ -1,18 +1,23 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig.port Wed Dec 3 03:13:20 2014
|
||||
+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc Sat Dec 6 11:34:25 2014
|
||||
@@ -4,6 +4,10 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_linux_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc Sat Mar 5 19:12:21 2016
|
||||
@@ -4,6 +4,15 @@
|
||||
|
||||
#include "chrome/browser/extensions/api/music_manager_private/device_id.h"
|
||||
|
||||
+#include "build/build_config.h"
|
||||
+
|
||||
+#if defined(OS_BSD)
|
||||
+#include <sys/types.h>
|
||||
+#include <net/if_dl.h>
|
||||
+#include <netinet/in.h>
|
||||
+#include <sys/socket.h>
|
||||
+#endif
|
||||
#include <sys/socket.h> // Must be included before ifaddrs.h.
|
||||
+
|
||||
#include <ifaddrs.h>
|
||||
#include <net/if.h>
|
||||
@@ -102,11 +106,33 @@ class MacAddressProcessor {
|
||||
#include <stddef.h>
|
||||
@@ -105,11 +114,33 @@ class MacAddressProcessor {
|
||||
const char* const prefixes[],
|
||||
size_t prefixes_count) {
|
||||
const int MAC_LENGTH = 6;
|
||||
@ -47,7 +52,7 @@ $OpenBSD: patch-chrome_browser_extensions_api_music_manager_private_device_id_li
|
||||
int sd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
|
||||
close(sd);
|
||||
@@ -116,11 +142,17 @@ class MacAddressProcessor {
|
||||
@@ -119,11 +150,17 @@ class MacAddressProcessor {
|
||||
|
||||
const char* mac_address =
|
||||
static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig.port Sat Jul 19 11:17:49 2014
|
||||
+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc Sat Jul 19 11:28:45 2014
|
||||
@@ -39,7 +39,7 @@ const char kBackgroundTabDisposition[] = "newBackgroun
|
||||
$OpenBSD: patch-chrome_browser_extensions_api_omnibox_omnibox_api_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -43,7 +43,7 @@ const char kBackgroundTabDisposition[] = "newBackgroun
|
||||
// Pref key for omnibox.setDefaultSuggestion.
|
||||
const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
|
||||
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.6 2016/02/15 18:07:52 robert Exp $
|
||||
--- chrome/browser/extensions/bookmark_app_helper.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/extensions/bookmark_app_helper.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -697,7 +697,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
|
||||
$OpenBSD: patch-chrome_browser_extensions_bookmark_app_helper_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/extensions/bookmark_app_helper.cc.orig.port Thu Mar 3 10:03:03 2016
|
||||
+++ chrome/browser/extensions/bookmark_app_helper.cc Thu Mar 3 10:03:09 2016
|
||||
@@ -705,7 +705,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
|
||||
chrome::HostDesktopType desktop = browser->host_desktop_type();
|
||||
if (desktop != chrome::HOST_DESKTOP_TYPE_ASH) {
|
||||
web_app::ShortcutLocations creation_locations;
|
||||
-#if defined(OS_LINUX)
|
||||
+#if defined(OS_LINUX) || defined(OS_BSD)
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
|
||||
creation_locations.on_desktop = true;
|
||||
#elif defined(OS_WIN)
|
||||
// Create the shortcut on the desktop if it's not possible to pin to the
|
||||
#else
|
||||
creation_locations.on_desktop = false;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/gpu/gl_string_manager.cc.orig.port Sun Oct 20 17:01:50 2013
|
||||
+++ chrome/browser/gpu/gl_string_manager.cc Sun Oct 20 17:02:02 2013
|
||||
@@ -25,7 +25,7 @@ GLStringManager::~GLStringManager() {
|
||||
$OpenBSD: patch-chrome_browser_gpu_gl_string_manager_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/gpu/gl_string_manager.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/gpu/gl_string_manager.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -26,7 +26,7 @@ GLStringManager::~GLStringManager() {
|
||||
|
||||
void GLStringManager::Initialize() {
|
||||
// On MacOSX or Windows, preliminary GPUInfo is enough.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/gpu/gpu_feature_checker.cc.orig.port Sun Oct 20 17:02:12 2013
|
||||
+++ chrome/browser/gpu/gpu_feature_checker.cc Sun Oct 20 17:02:21 2013
|
||||
@@ -33,7 +33,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability()
|
||||
$OpenBSD: patch-chrome_browser_gpu_gpu_feature_checker_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/gpu/gpu_feature_checker.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/gpu/gpu_feature_checker.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability()
|
||||
CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
||||
|
||||
bool finalized = true;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.5 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port Sat Aug 22 21:01:52 2015
|
||||
+++ chrome/browser/media_galleries/media_file_system_registry.cc Wed Sep 2 07:31:55 2015
|
||||
@@ -764,7 +764,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_file_system_registry_cc,v 1.6 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/media_galleries/media_file_system_registry.cc Thu Mar 3 09:43:25 2016
|
||||
@@ -766,7 +766,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
|
||||
// Constructor in 'private' section because depends on private class definition.
|
||||
MediaFileSystemRegistry::MediaFileSystemRegistry()
|
||||
: file_system_context_(new MediaFileSystemContextImpl) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_folder_finder_cc,v 1.3 2015/05/26 17:37:39 robert Exp $
|
||||
--- chrome/browser/media_galleries/media_folder_finder.cc.orig.port Thu May 14 00:23:03 2015
|
||||
+++ chrome/browser/media_galleries/media_folder_finder.cc Sat May 23 18:32:06 2015
|
||||
@@ -50,10 +50,10 @@ const int kPrunedPaths[] = {
|
||||
$OpenBSD: patch-chrome_browser_media_galleries_media_folder_finder_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/media_galleries/media_folder_finder.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/media_galleries/media_folder_finder.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -55,10 +55,10 @@ const int kPrunedPaths[] = {
|
||||
chrome::DIR_USER_APPLICATIONS,
|
||||
chrome::DIR_USER_LIBRARY,
|
||||
#endif
|
||||
@ -13,4 +13,4 @@ $OpenBSD: patch-chrome_browser_media_galleries_media_folder_finder_cc,v 1.3 2015
|
||||
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
|
||||
base::DIR_TEMP,
|
||||
#endif
|
||||
};
|
||||
#if defined(OS_ANDROID)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.5 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/memory_details.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/memory_details.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -31,7 +31,7 @@
|
||||
$OpenBSD: patch-chrome_browser_memory_details_cc,v 1.6 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/memory_details.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/memory_details.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "content/public/common/content_constants.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.5 2016/02/15 18:07:53 rober
|
||||
#include "content/public/browser/zygote_host_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -211,7 +211,7 @@ void MemoryDetails::CollectChildInfoOnIOThread(Collect
|
||||
@@ -212,7 +212,7 @@ void MemoryDetails::CollectChildInfoOnIOThread(Collect
|
||||
void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_memory_details_cc,v 1.5 2016/02/15 18:07:53 rober
|
||||
const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
|
||||
#endif
|
||||
|
||||
@@ -365,7 +365,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
@@ -366,7 +366,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.3 2015/08/12 10:56:13 robert Exp $
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig.port Wed Jul 15 22:29:58 2015
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc Wed Jul 22 08:37:29 2015
|
||||
@@ -30,8 +30,10 @@
|
||||
$OpenBSD: patch-chrome_browser_metrics_chrome_browser_main_extra_parts_metrics_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -36,8 +36,10 @@
|
||||
#include <cpu-features.h>
|
||||
#endif // defined(OS_ANDROID) && defined(__arm__)
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.6 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/notifications/message_center_notification_manager.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -62,7 +62,7 @@ MessageCenterNotificationManager::MessageCenterNotific
|
||||
$OpenBSD: patch-chrome_browser_notifications_message_center_notification_manager_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/notifications/message_center_notification_manager.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/notifications/message_center_notification_manager.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -74,7 +74,7 @@ MessageCenterNotificationManager::MessageCenterNotific
|
||||
blockers_.push_back(make_scoped_ptr(
|
||||
new FullscreenNotificationBlocker(message_center)));
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.7 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/process_singleton_posix.cc.orig.port Fri Nov 13 12:04:14 2015
|
||||
+++ chrome/browser/process_singleton_posix.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -84,11 +84,11 @@
|
||||
$OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.8 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/process_singleton_posix.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/process_singleton_posix.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -87,11 +87,11 @@
|
||||
#include "net/base/net_util.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
@ -15,7 +15,7 @@ $OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.7 2015/12/17 07:02
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -313,7 +313,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
|
||||
@@ -315,7 +315,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
|
||||
if (g_disable_prompt)
|
||||
return false;
|
||||
|
||||
@ -24,7 +24,7 @@ $OpenBSD: patch-chrome_browser_process_singleton_posix_cc,v 1.7 2015/12/17 07:02
|
||||
base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
|
||||
IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
|
||||
return ShowProcessSingletonDialog(error, relaunch_button_text);
|
||||
@@ -867,7 +867,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
|
||||
@@ -869,7 +869,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
|
||||
// The other process is shutting down, it's safe to start a new process.
|
||||
return PROCESS_NONE;
|
||||
} else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.6 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/renderer_preferences_util.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/renderer_preferences_util.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -14,7 +14,7 @@
|
||||
$OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/renderer_preferences_util.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/renderer_preferences_util.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "content/public/common/webrtc_ip_handling_policy.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.6 2016/02/15 18:
|
||||
#include "ui/gfx/font_render_params.h"
|
||||
#endif
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "ui/views/controls/textfield/textfield.h"
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.6 2016/02/15 18:
|
||||
#include "chrome/browser/themes/theme_service.h"
|
||||
#include "chrome/browser/themes/theme_service_factory.h"
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
@@ -94,7 +94,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
|
||||
@@ -95,7 +95,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
|
||||
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
|
||||
#endif
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_renderer_preferences_util_cc,v 1.6 2016/02/15 18:
|
||||
views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
||||
if (linux_ui) {
|
||||
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
|
||||
@@ -116,7 +116,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
|
||||
@@ -117,7 +117,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.6 2016/02/15 18:07:53 robert Exp $
|
||||
$OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig.port Mon Feb 15 12:14:39 2016
|
||||
+++ chrome/browser/resources/plugin_metadata/plugins_linux.json Mon Feb 15 12:14:46 2016
|
||||
@@ -70,28 +70,6 @@
|
||||
@ -15,9 +15,9 @@ $OpenBSD: patch-chrome_browser_resources_plugin_metadata_plugins_linux_json,v 1.
|
||||
- ],
|
||||
- "versions": [
|
||||
- {
|
||||
- "version": "20.0.0.267",
|
||||
- "version": "20.0.0.306",
|
||||
- "status": "up_to_date",
|
||||
- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-01.html"
|
||||
- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-04.html"
|
||||
- }
|
||||
- ],
|
||||
- "lang": "en-US",
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc,v 1.3 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig.port Sun Dec 20 19:33:33 2015
|
||||
+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc Tue Feb 9 21:21:19 2016
|
||||
@@ -733,7 +733,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
|
||||
$OpenBSD: patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig.port Mon Mar 21 19:53:19 2016
|
||||
+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc Wed Mar 23 12:37:29 2016
|
||||
@@ -735,7 +735,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
|
||||
environment_collection_pending_ = false;
|
||||
|
||||
// CurrentProcessInfo::CreationTime() is missing on some platforms.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_speech_tts_controller_impl_cc,v 1.3 2015/08/12 10:56:13 robert Exp $
|
||||
--- chrome/browser/speech/tts_controller_impl.cc.orig.port Wed Jul 15 22:29:58 2015
|
||||
+++ chrome/browser/speech/tts_controller_impl.cc Wed Jul 22 08:37:29 2015
|
||||
@@ -364,9 +364,13 @@ int TtsControllerImpl::QueueSize() {
|
||||
$OpenBSD: patch-chrome_browser_speech_tts_controller_impl_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/speech/tts_controller_impl.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/speech/tts_controller_impl.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -367,9 +367,13 @@ int TtsControllerImpl::QueueSize() {
|
||||
}
|
||||
|
||||
TtsPlatformImpl* TtsControllerImpl::GetPlatformImpl() {
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_ssl_bad_clock_blocking_page_cc,v 1.2 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ssl/bad_clock_blocking_page.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/ssl/bad_clock_blocking_page.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -95,7 +95,7 @@ void LaunchDateAndTimeSettings() {
|
||||
// iOS does not have a way to launch the date and time settings.
|
||||
NOTREACHED();
|
||||
|
||||
-#elif defined(OS_LINUX)
|
||||
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
||||
struct ClockCommand {
|
||||
const char* pathname;
|
||||
const char* argument;
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-chrome_browser_sync_chrome_sync_client_cc,v 1.1 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/sync/chrome_sync_client.cc.orig.port Thu Mar 3 10:04:19 2016
|
||||
+++ chrome/browser/sync/chrome_sync_client.cc Thu Mar 3 10:04:27 2016
|
||||
@@ -572,7 +572,7 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
// Dictionary sync is enabled by default.
|
||||
if (!disabled_types.Has(syncer::DICTIONARY)) {
|
||||
sync_service->RegisterDataTypeController(new UIDataTypeController(
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-chrome_browser_sync_profile_sync_components_factory_impl_cc,v 1.6 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/sync/profile_sync_components_factory_impl.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/sync/profile_sync_components_factory_impl.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -360,7 +360,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktop
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
|
||||
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
|
||||
// Dictionary sync is enabled by default.
|
||||
if (!disabled_types.Has(syncer::DICTIONARY)) {
|
||||
sync_service->RegisterDataTypeController(new UIDataTypeController(
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_task_manager_task_manager_cc,v 1.3 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/task_manager/task_manager.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/task_manager/task_manager.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -1203,7 +1203,7 @@ void TaskManagerModel::Refresh() {
|
||||
$OpenBSD: patch-chrome_browser_task_manager_task_manager_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/task_manager/task_manager.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/task_manager/task_manager.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -1204,7 +1204,7 @@ void TaskManagerModel::Refresh() {
|
||||
values.is_cpu_usage_valid = true;
|
||||
values.cpu_usage = metrics_iter->second->GetCPUUsage();
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.3 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/tracing/crash_service_uploader.cc.orig.port Tue Nov 24 21:00:54 2015
|
||||
+++ chrome/browser/tracing/crash_service_uploader.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -147,6 +147,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
|
||||
$OpenBSD: patch-chrome_browser_tracing_crash_service_uploader_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/tracing/crash_service_uploader.cc.orig.port Wed Feb 24 00:01:58 2016
|
||||
+++ chrome/browser/tracing/crash_service_uploader.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -150,6 +150,8 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
|
||||
const char product[] = "Chrome_Android";
|
||||
#elif defined(OS_CHROMEOS)
|
||||
const char product[] = "Chrome_ChromeOS";
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_app_list_app_list_service_cc,v 1.1 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/ui/app_list/app_list_service.cc.orig.port Thu Sep 24 12:59:35 2015
|
||||
+++ chrome/browser/ui/app_list/app_list_service.cc Thu Sep 24 13:05:18 2015
|
||||
@@ -42,7 +42,7 @@ base::Time GetOriginalProcessStartTime(const base::Com
|
||||
$OpenBSD: patch-chrome_browser_ui_app_list_app_list_service_cc,v 1.2 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/app_list/app_list_service.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/app_list/app_list_service.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -45,7 +45,7 @@ base::Time GetOriginalProcessStartTime(const base::Com
|
||||
|
||||
// base::CurrentProcessInfo::CreationTime() is only defined on some
|
||||
// platforms.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Wed Apr 15 00:18:50 2015
|
||||
+++ chrome/browser/ui/ash/system_tray_delegate_common.cc Wed Apr 15 08:32:50 2015
|
||||
@@ -79,7 +79,7 @@ base::HourClockType SystemTrayDelegateCommon::GetHourC
|
||||
$OpenBSD: patch-chrome_browser_ui_ash_system_tray_delegate_common_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/ash/system_tray_delegate_common.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/ash/system_tray_delegate_common.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -80,7 +80,7 @@ base::HourClockType SystemTrayDelegateCommon::GetHourC
|
||||
}
|
||||
|
||||
void SystemTrayDelegateCommon::ShowChromeSlow() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_cc,v 1.4 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig.port Wed Jan 20 21:01:19 2016
|
||||
+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -19,7 +19,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_cc,v 1.5 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ui/gfx/screen.h"
|
||||
#include "ui/views/widget/native_widget_aura.h"
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_cc,v
|
||||
#include "base/prefs/pref_service.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
@@ -73,7 +73,7 @@ chrome::HostDesktopType GetInitialDesktop() {
|
||||
@@ -77,7 +77,7 @@ chrome::HostDesktopType GetInitialDesktop() {
|
||||
command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
|
||||
return chrome::HOST_DESKTOP_TYPE_ASH;
|
||||
}
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_cc,v
|
||||
const base::CommandLine* command_line =
|
||||
base::CommandLine::ForCurrentProcess();
|
||||
if (command_line->HasSwitch(switches::kOpenAsh))
|
||||
@@ -140,7 +140,7 @@ void ChromeBrowserMainExtraPartsAura::PreCreateThreads
|
||||
@@ -145,7 +145,7 @@ void ChromeBrowserMainExtraPartsAura::PreCreateThreads
|
||||
}
|
||||
|
||||
void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_cc,v
|
||||
// Now that we have some minimal ui initialized, check to see if we're
|
||||
// running as root and bail if we are.
|
||||
DetectRunningAsRoot();
|
||||
@@ -154,7 +154,7 @@ void ChromeBrowserMainExtraPartsAura::PostMainMessageL
|
||||
@@ -159,7 +159,7 @@ void ChromeBrowserMainExtraPartsAura::PostMainMessageL
|
||||
// after the metrics service is deleted.
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_h,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h.orig.port Wed Dec 3 03:13:21 2014
|
||||
+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h Sat Dec 6 11:34:25 2014
|
||||
@@ -25,7 +25,7 @@ class ChromeBrowserMainExtraPartsAura : public ChromeB
|
||||
$OpenBSD: patch-chrome_browser_ui_aura_chrome_browser_main_extra_parts_aura_h,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h Thu Mar 3 09:43:26 2016
|
||||
@@ -26,7 +26,7 @@ class ChromeBrowserMainExtraPartsAura : public ChromeB
|
||||
void PostMainMessageLoopRun() override;
|
||||
|
||||
private:
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.8 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig.port Sun Dec 20 19:33:32 2015
|
||||
+++ chrome/browser/ui/browser_command_controller.cc Tue Feb 9 21:21:19 2016
|
||||
@@ -71,7 +71,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.9 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/browser_command_controller.cc.orig.port Mon Mar 21 19:53:19 2016
|
||||
+++ chrome/browser/ui/browser_command_controller.cc Wed Mar 23 12:37:29 2016
|
||||
@@ -76,7 +76,7 @@
|
||||
#include "chrome/browser/ui/browser_commands_chromeos.h"
|
||||
#endif
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.8 2016/02/15
|
||||
#include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
|
||||
#endif
|
||||
|
||||
@@ -284,7 +284,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
@@ -221,7 +221,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
|
||||
if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
|
||||
return true;
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.8 2016/02/15
|
||||
// If this key was registered by the user as a content editing hotkey, then
|
||||
// it is not reserved.
|
||||
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
|
||||
@@ -477,7 +477,7 @@ void BrowserCommandController::ExecuteCommandWithDispo
|
||||
@@ -414,7 +414,7 @@ void BrowserCommandController::ExecuteCommandWithDispo
|
||||
break;
|
||||
#endif
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_command_controller_cc,v 1.8 2016/02/15
|
||||
case IDC_USE_SYSTEM_TITLE_BAR: {
|
||||
PrefService* prefs = browser_->profile()->GetPrefs();
|
||||
prefs->SetBoolean(prefs::kUseCustomChromeFrame,
|
||||
@@ -915,7 +915,7 @@ void BrowserCommandController::InitCommandState() {
|
||||
@@ -815,7 +815,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
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/browser_view_prefs.cc.orig.port Wed Sep 10 01:29:19 2014
|
||||
+++ chrome/browser/ui/browser_view_prefs.cc Wed Sep 10 22:05:40 2014
|
||||
@@ -9,7 +9,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/browser_view_prefs.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/browser_view_prefs.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "components/pref_registry/pref_registry_syncable.h"
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_browser_view_prefs_cc,v 1.2 2015/05/06 14:27:2
|
||||
#include "ui/base/x/x11_util.h"
|
||||
#endif
|
||||
|
||||
@@ -42,7 +42,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple*
|
||||
@@ -43,7 +43,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple*
|
||||
void RegisterBrowserViewProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
bool custom_frame_default = false;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig.port Wed Mar 11 07:33:06 2015
|
||||
+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc Wed Mar 11 07:33:16 2015
|
||||
@@ -18,7 +18,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_exclusive_access_exclusive_access_bubble_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
// NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
|
||||
// here.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_panels_panel_manager_cc,v 1.4 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/ui/panels/panel_manager.cc.orig.port Fri Nov 13 12:04:15 2015
|
||||
+++ chrome/browser/ui/panels/panel_manager.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -136,7 +136,7 @@ bool PanelManager::ShouldUsePanels(const std::string&
|
||||
$OpenBSD: patch-chrome_browser_ui_panels_panel_manager_cc,v 1.5 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/panels/panel_manager.cc.orig.port Wed Feb 24 00:01:59 2016
|
||||
+++ chrome/browser/ui/panels/panel_manager.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -142,7 +142,7 @@ bool PanelManager::ShouldUsePanels(const std::string&
|
||||
// static
|
||||
bool PanelManager::IsPanelStackingEnabled() {
|
||||
// Stacked panel mode is not supported in linux-aura.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_bad_flags_prompt_cc,v 1.4 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/startup/bad_flags_prompt.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -71,7 +71,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_bad_flags_prompt_cc,v 1.5 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/startup/bad_flags_prompt.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -73,7 +73,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
|
||||
// This flag gives extensions more powers.
|
||||
extensions::switches::kExtensionsOnChromeURLs,
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.6 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Tue Nov 24 21:00:54 2015
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -657,8 +657,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
$OpenBSD: patch-chrome_browser_ui_startup_startup_browser_creator_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/startup/startup_browser_creator.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/startup/startup_browser_creator.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -686,8 +686,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
||||
}
|
||||
#endif // OS_CHROMEOS
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.1 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/toolbar/app_menu_model.cc.orig.port Fri Jan 22 22:04:59 2016
|
||||
+++ chrome/browser/ui/toolbar/app_menu_model.cc Fri Jan 22 22:05:17 2016
|
||||
@@ -779,7 +779,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
|
||||
$OpenBSD: patch-chrome_browser_ui_toolbar_app_menu_model_cc,v 1.2 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/toolbar/app_menu_model.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/toolbar/app_menu_model.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -713,7 +713,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
|
||||
case IDC_UPGRADE_DIALOG:
|
||||
return browser_defaults::kShowUpgradeMenuItem &&
|
||||
UpgradeDetector::GetInstance()->notify_upgrade();
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_accelerator_table_cc,v 1.4 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/views/accelerator_table.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/views/accelerator_table.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -68,7 +68,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
$OpenBSD: patch-chrome_browser_ui_views_accelerator_table_cc,v 1.5 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/accelerator_table.cc.orig.port Wed Feb 24 00:01:59 2016
|
||||
+++ chrome/browser/ui/views/accelerator_table.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -71,7 +71,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
{ ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
|
||||
{ ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB },
|
||||
{ ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB },
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_accelerator_table_cc,v 1.4 2016/02/15 18
|
||||
{ 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 },
|
||||
@@ -96,7 +96,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
@@ -99,7 +99,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 },
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_accelerator_table_cc,v 1.4 2016/02/15 18
|
||||
{ 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 },
|
||||
@@ -145,7 +145,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
@@ -148,7 +148,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
||||
{ ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN },
|
||||
|
||||
// Platform-specific key maps.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/views/app_list/linux/app_list_linux.cc.orig.port Sat Dec 27 12:59:28 2014
|
||||
+++ chrome/browser/ui/views/app_list/linux/app_list_linux.cc Sat Dec 27 13:07:15 2014
|
||||
@@ -91,7 +91,7 @@ void AppListLinux::MoveNearCursor(app_list::AppListVie
|
||||
$OpenBSD: patch-chrome_browser_ui_views_app_list_linux_app_list_linux_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/app_list/linux/app_list_linux.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/app_list/linux/app_list_linux.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -92,7 +92,7 @@ void AppListLinux::MoveNearCursor(app_list::AppListVie
|
||||
view->SetBubbleArrow(views::BubbleBorder::FLOAT);
|
||||
|
||||
AppListPositioner::ScreenEdge edge;
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.3 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig.port Sat Aug 22 21:01:52 2015
|
||||
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc Wed Sep 2 07:31:55 2015
|
||||
@@ -34,7 +34,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "ash/shell_window_ids.h"
|
||||
#endif
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_apps_chrome_native_app_window_views_aura
|
||||
#include "chrome/browser/shell_integration_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -141,7 +141,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
|
||||
@@ -145,7 +145,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
|
||||
const AppWindow::CreateParams& create_params,
|
||||
views::Widget::InitParams* init_params,
|
||||
views::Widget* widget) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc.orig.port Sat Dec 27 12:59:28 2014
|
||||
+++ chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc Sat Dec 27 13:07:28 2014
|
||||
@@ -75,7 +75,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit()
|
||||
$OpenBSD: patch-chrome_browser_ui_views_ash_chrome_browser_main_extra_parts_ash_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -77,7 +77,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit()
|
||||
if (chrome::ShouldOpenAshOnStartup()) {
|
||||
chrome::OpenAsh(gfx::kNullAcceleratedWidget);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Tue Nov 24 21:00:54 2015
|
||||
+++ chrome/browser/ui/views/chrome_views_delegate.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -48,7 +48,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/chrome_views_delegate.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/chrome_views_delegate.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -49,7 +49,7 @@
|
||||
#include "ui/views/widget/native_widget_aura.h"
|
||||
#endif
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/12/1
|
||||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
@@ -271,7 +271,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW
|
||||
@@ -295,7 +295,7 @@ bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeW
|
||||
return chrome::IsNativeViewInAsh(window);
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_views_chrome_views_delegate_cc,v 1.6 2015/12/1
|
||||
gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
|
||||
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
||||
return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
|
||||
@@ -410,7 +410,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
|
||||
@@ -451,7 +451,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc,v 1.2 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/views/exclusive_access_bubble_views.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/views/exclusive_access_bubble_views.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -204,7 +204,7 @@ ExclusiveAccessBubbleViews::ExclusiveAccessView::Exclu
|
||||
$OpenBSD: patch-chrome_browser_ui_views_exclusive_access_bubble_views_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/exclusive_access_bubble_views.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/exclusive_access_bubble_views.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -233,7 +233,7 @@ ExclusiveAccessBubbleViews::ExclusiveAccessView::Exclu
|
||||
exit_instruction_(nullptr),
|
||||
browser_fullscreen_exit_accelerator_(accelerator) {
|
||||
views::BubbleBorder::Shadow shadow_type = views::BubbleBorder::BIG_SHADOW;
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.1 2015/05/26 17:37:39 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/browser_frame.cc.orig.port Sat May 23 00:59:48 2015
|
||||
+++ chrome/browser/ui/views/frame/browser_frame.cc Sat May 23 01:05:57 2015
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "ash/shell.h"
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.2 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/browser_frame.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/frame/browser_frame.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "ui/native_theme/native_theme_dark_aura.h"
|
||||
#endif
|
||||
|
||||
-#if defined(OS_LINUX)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_browser_frame_cc,v 1.1 2015/05/26
|
||||
#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -82,7 +82,7 @@ void BrowserFrame::InitBrowserFrame() {
|
||||
@@ -100,7 +100,7 @@ void BrowserFrame::InitBrowserFrame() {
|
||||
non_client_view()->set_context_menu_controller(this);
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.7 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Fri Jan 22 22:05:32 2016
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Fri Jan 22 22:05:50 2016
|
||||
@@ -55,7 +55,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.8 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -57,7 +57,7 @@
|
||||
#include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
|
||||
#endif
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_cc,v 1.7
|
||||
#include "ui/views/controls/menu/menu_runner.h"
|
||||
#endif
|
||||
|
||||
@@ -336,7 +336,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
|
||||
@@ -339,7 +339,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
|
||||
|
||||
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
|
||||
const gfx::Point& point) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.2 2015/05/06 14:27:23 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig.port Wed Dec 3 03:32:11 2014
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc Sat Dec 6 11:34:25 2014
|
||||
@@ -87,7 +87,7 @@ const int kTabstripTopShadowThickness = 3;
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_opaque_browser_frame_view_layout_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -89,7 +89,7 @@ const int kTabstripTopShadowThickness = 3;
|
||||
// is no avatar icon.
|
||||
const int kTabStripIndent = -6;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.4 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -86,7 +86,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
$OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.5 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig.port Wed Feb 24 00:01:59 2016
|
||||
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -88,7 +88,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
|
||||
}
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_frame_system_menu_model_builder_cc,v 1.4
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
|
||||
IDS_SHOW_WINDOW_DECORATIONS_MENU);
|
||||
@@ -124,7 +124,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
|
||||
@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
|
||||
model->AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.3 2015/05/26 17:37:40 robert Exp $
|
||||
--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Thu May 14 00:23:04 2015
|
||||
+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Wed May 20 08:34:56 2015
|
||||
@@ -14,7 +14,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_message_center_message_center_frame_view_cc,v 1.4 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig.port Wed Feb 24 00:01:59 2016
|
||||
+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -15,7 +15,7 @@
|
||||
namespace message_center {
|
||||
|
||||
MessageCenterFrameView::MessageCenterFrameView() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_panels_panel_frame_view_cc,v 1.4 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/ui/views/panels/panel_frame_view.cc.orig.port Sat Aug 22 21:01:52 2015
|
||||
+++ chrome/browser/ui/views/panels/panel_frame_view.cc Wed Sep 2 07:31:55 2015
|
||||
@@ -587,7 +587,7 @@ bool PanelFrameView::OnMousePressed(const ui::MouseEve
|
||||
$OpenBSD: patch-chrome_browser_ui_views_panels_panel_frame_view_cc,v 1.5 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/panels/panel_frame_view.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/panels/panel_frame_view.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -589,7 +589,7 @@ bool PanelFrameView::OnMousePressed(const ui::MouseEve
|
||||
}
|
||||
|
||||
bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.6 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig.port Fri Jan 22 22:07:37 2016
|
||||
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc Fri Jan 22 22:08:15 2016
|
||||
@@ -272,7 +272,7 @@ void TabDragController::Init(
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig.port Thu Mar 3 10:04:33 2016
|
||||
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc Thu Mar 3 10:05:04 2016
|
||||
@@ -274,7 +274,7 @@ void TabDragController::Init(
|
||||
// synchronous on desktop Linux, so use that.
|
||||
// - Ash
|
||||
// Releasing capture on Ash cancels gestures so avoid it.
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.6 2016/0
|
||||
can_release_capture_ = false;
|
||||
#else
|
||||
can_release_capture_ =
|
||||
@@ -624,7 +624,7 @@ TabDragController::DragBrowserToNewTabStrip(
|
||||
@@ -626,7 +626,7 @@ TabDragController::DragBrowserToNewTabStrip(
|
||||
// that to effect the position of any windows.
|
||||
SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
|
||||
|
||||
@ -19,10 +19,10 @@ $OpenBSD: patch-chrome_browser_ui_views_tabs_tab_drag_controller_cc,v 1.6 2016/0
|
||||
// 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.
|
||||
@@ -1799,7 +1799,7 @@ gfx::NativeWindow TabDragController::GetLocalProcessWi
|
||||
attached_tabstrip_->GetWidget()->GetNativeWindow();
|
||||
if (exclude_dragged_view && dragged_window)
|
||||
@@ -1806,7 +1806,7 @@ gfx::NativeWindow TabDragController::GetLocalProcessWi
|
||||
if (dragged_window)
|
||||
exclude.insert(dragged_window);
|
||||
}
|
||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
||||
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
||||
// Exclude windows which are pending deletion via Browser::TabStripEmpty().
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.6 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/views/tabs/tab_strip.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -290,7 +290,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views:
|
||||
$OpenBSD: patch-chrome_browser_ui_views_tabs_tab_strip_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/tabs/tab_strip.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/tabs/tab_strip.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -334,7 +334,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, views:
|
||||
: views::ImageButton(listener),
|
||||
tab_strip_(tab_strip),
|
||||
destroyed_(NULL) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_views_task_manager_view_cc,v 1.2 2015/10/24 18:22:21 robert Exp $
|
||||
--- chrome/browser/ui/views/task_manager_view.cc.orig.port Wed Oct 7 04:42:09 2015
|
||||
+++ chrome/browser/ui/views/task_manager_view.cc Wed Oct 14 07:41:13 2015
|
||||
@@ -341,7 +341,7 @@ void TaskManagerView::Init() {
|
||||
$OpenBSD: patch-chrome_browser_ui_views_task_manager_view_cc,v 1.3 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/views/task_manager_view.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/views/task_manager_view.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -345,7 +345,7 @@ void TaskManagerView::Init() {
|
||||
columns_.back().sortable = true;
|
||||
columns_.back().initial_sort_is_ascending = false;
|
||||
// TODO(port) http://crbug.com/120488 for non-Linux.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2015/12/17 07:02:48 robert Exp $
|
||||
--- chrome/browser/ui/webui/about_ui.cc.orig.port Fri Nov 13 12:04:15 2015
|
||||
+++ chrome/browser/ui/webui/about_ui.cc Wed Dec 2 08:18:32 2015
|
||||
@@ -68,7 +68,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.7 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/webui/about_ui.cc.orig.port Wed Feb 24 21:01:31 2016
|
||||
+++ chrome/browser/ui/webui/about_ui.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -73,7 +73,7 @@
|
||||
#include "chrome/browser/ui/webui/theme_source.h"
|
||||
#endif
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2015/12/17 07:02:48 ro
|
||||
#include "content/public/browser/zygote_host_linux.h"
|
||||
#include "content/public/common/sandbox_linux.h"
|
||||
#endif
|
||||
@@ -701,7 +701,7 @@ void FinishMemoryDataRequest(
|
||||
@@ -706,7 +706,7 @@ void FinishMemoryDataRequest(
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2015/12/17 07:02:48 ro
|
||||
std::string AboutLinuxProxyConfig() {
|
||||
std::string data;
|
||||
AppendHeader(&data, 0,
|
||||
@@ -717,6 +717,7 @@ std::string AboutLinuxProxyConfig() {
|
||||
@@ -722,6 +722,7 @@ std::string AboutLinuxProxyConfig() {
|
||||
return data;
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2015/12/17 07:02:48 ro
|
||||
void AboutSandboxRow(std::string* data, int name_id, bool good) {
|
||||
data->append("<tr><td>");
|
||||
data->append(l10n_util::GetStringUTF8(name_id));
|
||||
@@ -784,6 +785,7 @@ std::string AboutSandbox() {
|
||||
@@ -789,6 +790,7 @@ std::string AboutSandbox() {
|
||||
return data;
|
||||
}
|
||||
#endif
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2015/12/17 07:02:48 ro
|
||||
|
||||
// AboutMemoryHandler ----------------------------------------------------------
|
||||
|
||||
@@ -956,7 +958,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
@@ -961,7 +963,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
} else if (source_name_ == chrome::kChromeUIDNSHost) {
|
||||
AboutDnsHandler::Start(profile(), callback);
|
||||
return;
|
||||
@ -44,7 +44,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_about_ui_cc,v 1.6 2015/12/17 07:02:48 ro
|
||||
} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
|
||||
response = AboutLinuxProxyConfig();
|
||||
#endif
|
||||
@@ -970,7 +972,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
@@ -975,7 +977,7 @@ void AboutUIHTMLSource::StartDataRequest(
|
||||
ChromeOSCreditsHandler::Start(path, callback);
|
||||
return;
|
||||
#endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.7 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -527,7 +527,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_chrome_web_ui_controller_factory_cc,v 1.8 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig.port Wed Feb 24 21:01:32 2016
|
||||
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -519,7 +519,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
|
||||
if (url.host() == chrome::kChromeUINaClHost)
|
||||
return &NewWebUI<NaClUI>;
|
||||
#endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.7 2016/02/15 18:07:53 robert Exp $
|
||||
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Wed Jan 20 21:01:20 2016
|
||||
+++ chrome/browser/ui/webui/options/browser_options_handler.cc Fri Jan 22 19:58:58 2016
|
||||
@@ -478,7 +478,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
|
||||
$OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.8 2016/03/23 20:13:07 robert Exp $
|
||||
--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig.port Wed Feb 24 21:01:32 2016
|
||||
+++ chrome/browser/ui/webui/options/browser_options_handler.cc Thu Mar 3 09:43:26 2016
|
||||
@@ -483,7 +483,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::D
|
||||
{ "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.7
|
||||
{ "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
|
||||
{ "themesNativeButton", IDS_THEMES_GTK_BUTTON },
|
||||
{ "themesSetClassic", IDS_THEMES_SET_CLASSIC },
|
||||
@@ -725,7 +725,7 @@ void BrowserOptionsHandler::RegisterMessages() {
|
||||
@@ -730,7 +730,7 @@ void BrowserOptionsHandler::RegisterMessages() {
|
||||
"requestProfilesInfo",
|
||||
base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
|
||||
base::Unretained(this)));
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.7
|
||||
web_ui()->RegisterMessageCallback(
|
||||
"themesSetNative",
|
||||
base::Bind(&BrowserOptionsHandler::ThemesSetNative,
|
||||
@@ -1348,7 +1348,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
|
||||
@@ -1355,7 +1355,7 @@ void BrowserOptionsHandler::ObserveThemeChanged() {
|
||||
ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
|
||||
bool is_system_theme = false;
|
||||
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-chrome_browser_ui_webui_options_browser_options_handler_cc,v 1.7
|
||||
bool profile_is_supervised = profile->IsSupervised();
|
||||
is_system_theme = theme_service->UsingSystemTheme();
|
||||
base::FundamentalValue native_theme_enabled(!is_system_theme &&
|
||||
@@ -1370,7 +1370,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li
|
||||
@@ -1377,7 +1377,7 @@ void BrowserOptionsHandler::ThemesReset(const base::Li
|
||||
ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
|
||||
}
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user