
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
134 lines
5.7 KiB
Diff
134 lines
5.7 KiB
Diff
diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon.h b/chrome/browser/ui/libgtkui/app_indicator_icon.h
|
|
index 7815fbb2cea8..f17a5c59e64b 100644
|
|
--- a/chrome/browser/ui/libgtkui/app_indicator_icon.h
|
|
+++ b/chrome/browser/ui/libgtkui/app_indicator_icon.h
|
|
@@ -12,6 +12,7 @@
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "base/nix/xdg_util.h"
|
|
#include "chrome/browser/ui/libgtkui/gtk_signal.h"
|
|
+#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
|
|
#include "ui/views/linux_ui/status_icon_linux.h"
|
|
|
|
typedef struct _AppIndicator AppIndicator;
|
|
@@ -31,7 +32,7 @@ namespace libgtkui {
|
|
class AppIndicatorIconMenu;
|
|
|
|
// Status icon implementation which uses libappindicator.
|
|
-class AppIndicatorIcon : public views::StatusIconLinux {
|
|
+class LIBGTKUI_EXPORT AppIndicatorIcon : public views::StatusIconLinux {
|
|
public:
|
|
// The id uniquely identifies the new status icon from other chrome status
|
|
// icons.
|
|
diff --git a/chrome/browser/ui/libgtkui/gtk_status_icon.h b/chrome/browser/ui/libgtkui/gtk_status_icon.h
|
|
index e4e0da40981c..af028715ada9 100644
|
|
--- a/chrome/browser/ui/libgtkui/gtk_status_icon.h
|
|
+++ b/chrome/browser/ui/libgtkui/gtk_status_icon.h
|
|
@@ -10,6 +10,7 @@
|
|
#include "base/macros.h"
|
|
#include "base/strings/string16.h"
|
|
#include "chrome/browser/ui/libgtkui/gtk_signal.h"
|
|
+#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
|
|
#include "ui/base/glib/glib_integers.h"
|
|
#include "ui/base/glib/glib_signal.h"
|
|
#include "ui/views/linux_ui/status_icon_linux.h"
|
|
@@ -29,7 +30,7 @@ class AppIndicatorIconMenu;
|
|
|
|
// Status icon implementation which uses the system tray X11 spec (via
|
|
// GtkStatusIcon).
|
|
-class Gtk2StatusIcon : public views::StatusIconLinux {
|
|
+class LIBGTKUI_EXPORT Gtk2StatusIcon : public views::StatusIconLinux {
|
|
public:
|
|
Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip);
|
|
~Gtk2StatusIcon() override;
|
|
diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h
|
|
index 665ec57c09d5..4ccb08807fb4 100644
|
|
--- a/chrome/browser/ui/libgtkui/gtk_util.h
|
|
+++ b/chrome/browser/ui/libgtkui/gtk_util.h
|
|
@@ -11,6 +11,7 @@
|
|
#include "ui/base/glib/scoped_gobject.h"
|
|
#include "ui/native_theme/native_theme.h"
|
|
#include "ui/views/window/frame_buttons.h"
|
|
+#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
|
|
|
|
namespace aura {
|
|
class Window;
|
|
@@ -51,10 +52,10 @@ SkColor NormalURLColor(SkColor foreground);
|
|
// saturation than to look exactly like the foreground color.
|
|
SkColor SelectedURLColor(SkColor foreground, SkColor background);
|
|
|
|
-void GtkInitFromCommandLine(const base::CommandLine& command_line);
|
|
+LIBGTKUI_EXPORT void GtkInitFromCommandLine(const base::CommandLine& command_line);
|
|
|
|
// Returns the name of the ".desktop" file associated with our running process.
|
|
-std::string GetDesktopName(base::Environment* env);
|
|
+LIBGTKUI_EXPORT std::string GetDesktopName(base::Environment* env);
|
|
|
|
guint GetGdkKeyCodeForAccelerator(const ui::Accelerator& accelerator);
|
|
|
|
@@ -69,7 +70,7 @@ void TurnButtonBlue(GtkWidget* button);
|
|
|
|
// Sets |dialog| as transient for |parent|, which will keep it on top and center
|
|
// it above |parent|. Do nothing if |parent| is nullptr.
|
|
-void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent);
|
|
+LIBGTKUI_EXPORT void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent);
|
|
|
|
// Gets the transient parent aura window for |dialog|.
|
|
aura::Window* GetAuraTransientParent(GtkWidget* dialog);
|
|
@@ -190,7 +190,7 @@ void RenderBackground(const gfx::Size& size,
|
|
// Renders a background from the style context created by
|
|
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
|
|
// returns the average color.
|
|
-SkColor GetBgColor(const std::string& css_selector);
|
|
+LIBGTKUI_EXPORT SkColor GetBgColor(const std::string& css_selector);
|
|
|
|
// Renders the border from the style context created by
|
|
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
|
|
diff --git a/chrome/browser/ui/libgtkui/skia_utils_gtk.h b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
|
|
index e05fbe9d8b2f..3afca9a72ab6 100644
|
|
--- a/chrome/browser/ui/libgtkui/skia_utils_gtk.h
|
|
+++ b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
|
|
@@ -7,6 +7,7 @@
|
|
|
|
#include <stdint.h>
|
|
|
|
+#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
|
|
#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
typedef struct _GdkColor GdkColor;
|
|
@@ -41,7 +42,7 @@ const SkBitmap GdkPixbufToImageSkia(GdkPixbuf* pixbuf);
|
|
// Convert and copy a SkBitmap to a GdkPixbuf. NOTE: this uses BGRAToRGBA, so
|
|
// it is an expensive operation. The returned GdkPixbuf will have a refcount of
|
|
// 1, and the caller is responsible for unrefing it when done.
|
|
-GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap);
|
|
+LIBGTKUI_EXPORT GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap& bitmap);
|
|
|
|
} // namespace libgtkui
|
|
|
|
diff --git a/chrome/browser/ui/libgtkui/unity_service.h b/chrome/browser/ui/libgtkui/unity_service.h
|
|
index 8d67e1460837..95fbb27b6a81 100644
|
|
--- a/chrome/browser/ui/libgtkui/unity_service.h
|
|
+++ b/chrome/browser/ui/libgtkui/unity_service.h
|
|
@@ -5,18 +5,20 @@
|
|
#ifndef CHROME_BROWSER_UI_LIBGTKUI_UNITY_SERVICE_H_
|
|
#define CHROME_BROWSER_UI_LIBGTKUI_UNITY_SERVICE_H_
|
|
|
|
+#include "chrome/browser/ui/libgtkui/libgtkui_export.h"
|
|
+
|
|
namespace unity {
|
|
|
|
// Returns whether unity is currently running.
|
|
-bool IsRunning();
|
|
+LIBGTKUI_EXPORT bool IsRunning();
|
|
|
|
// If unity is running, sets the download counter in the dock icon. Any value
|
|
// other than 0 displays the badge.
|
|
-void SetDownloadCount(int count);
|
|
+LIBGTKUI_EXPORT void SetDownloadCount(int count);
|
|
|
|
// If unity is running, sets the download progress bar in the dock icon. Any
|
|
// value between 0.0 and 1.0 (exclusive) shows the progress bar.
|
|
-void SetProgressFraction(float percentage);
|
|
+LIBGTKUI_EXPORT void SetProgressFraction(float percentage);
|
|
|
|
} // namespace unity
|
|
|