8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
284 lines
10 KiB
Objective-C
284 lines
10 KiB
Objective-C
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_BROWSER_NATIVE_WINDOW_MAC_H_
|
|
#define SHELL_BROWSER_NATIVE_WINDOW_MAC_H_
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include <memory>
|
|
#include <queue>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/mac/scoped_nsobject.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "ui/display/display_observer.h"
|
|
#include "ui/native_theme/native_theme_observer.h"
|
|
#include "ui/views/controls/native/native_view_host.h"
|
|
|
|
@class ElectronNSWindow;
|
|
@class ElectronNSWindowDelegate;
|
|
@class ElectronPreviewItem;
|
|
@class ElectronTouchBar;
|
|
@class WindowButtonsView;
|
|
|
|
namespace electron {
|
|
|
|
class RootViewMac;
|
|
|
|
class NativeWindowMac : public NativeWindow,
|
|
public ui::NativeThemeObserver,
|
|
public display::DisplayObserver {
|
|
public:
|
|
NativeWindowMac(const gin_helper::Dictionary& options, NativeWindow* parent);
|
|
~NativeWindowMac() override;
|
|
|
|
// NativeWindow:
|
|
void SetContentView(views::View* view) override;
|
|
void Close() override;
|
|
void CloseImmediately() override;
|
|
void Focus(bool focus) override;
|
|
bool IsFocused() override;
|
|
void Show() override;
|
|
void ShowInactive() override;
|
|
void Hide() override;
|
|
bool IsVisible() override;
|
|
bool IsEnabled() override;
|
|
void SetEnabled(bool enable) override;
|
|
void Maximize() override;
|
|
void Unmaximize() override;
|
|
bool IsMaximized() override;
|
|
void Minimize() override;
|
|
void Restore() override;
|
|
bool IsMinimized() override;
|
|
void SetFullScreen(bool fullscreen) override;
|
|
bool IsFullscreen() const override;
|
|
void SetBounds(const gfx::Rect& bounds, bool animate = false) override;
|
|
gfx::Rect GetBounds() override;
|
|
bool IsNormal() override;
|
|
gfx::Rect GetNormalBounds() override;
|
|
void SetContentSizeConstraints(
|
|
const extensions::SizeConstraints& size_constraints) override;
|
|
void SetResizable(bool resizable) override;
|
|
bool MoveAbove(const std::string& sourceId) override;
|
|
void MoveTop() override;
|
|
bool IsResizable() override;
|
|
void SetMovable(bool movable) override;
|
|
bool IsMovable() override;
|
|
void SetMinimizable(bool minimizable) override;
|
|
bool IsMinimizable() override;
|
|
void SetMaximizable(bool maximizable) override;
|
|
bool IsMaximizable() override;
|
|
void SetFullScreenable(bool fullscreenable) override;
|
|
bool IsFullScreenable() override;
|
|
void SetClosable(bool closable) override;
|
|
bool IsClosable() override;
|
|
void SetAlwaysOnTop(ui::ZOrderLevel z_order,
|
|
const std::string& level,
|
|
int relative_level) override;
|
|
ui::ZOrderLevel GetZOrderLevel() override;
|
|
void Center() override;
|
|
void Invalidate() override;
|
|
void SetTitle(const std::string& title) override;
|
|
std::string GetTitle() override;
|
|
void FlashFrame(bool flash) override;
|
|
void SetSkipTaskbar(bool skip) override;
|
|
void SetExcludedFromShownWindowsMenu(bool excluded) override;
|
|
bool IsExcludedFromShownWindowsMenu() override;
|
|
void SetSimpleFullScreen(bool simple_fullscreen) override;
|
|
bool IsSimpleFullScreen() override;
|
|
void SetKiosk(bool kiosk) override;
|
|
bool IsKiosk() override;
|
|
void SetBackgroundColor(SkColor color) override;
|
|
SkColor GetBackgroundColor() override;
|
|
void SetHasShadow(bool has_shadow) override;
|
|
bool HasShadow() override;
|
|
void SetOpacity(const double opacity) override;
|
|
double GetOpacity() override;
|
|
void SetRepresentedFilename(const std::string& filename) override;
|
|
std::string GetRepresentedFilename() override;
|
|
void SetDocumentEdited(bool edited) override;
|
|
bool IsDocumentEdited() override;
|
|
void SetIgnoreMouseEvents(bool ignore, bool forward) override;
|
|
void SetContentProtection(bool enable) override;
|
|
void SetFocusable(bool focusable) override;
|
|
bool IsFocusable() override;
|
|
void AddBrowserView(NativeBrowserView* browser_view) override;
|
|
void RemoveBrowserView(NativeBrowserView* browser_view) override;
|
|
void SetTopBrowserView(NativeBrowserView* browser_view) override;
|
|
void SetParentWindow(NativeWindow* parent) override;
|
|
content::DesktopMediaID GetDesktopMediaID() const override;
|
|
gfx::NativeView GetNativeView() const override;
|
|
gfx::NativeWindow GetNativeWindow() const override;
|
|
gfx::AcceleratedWidget GetAcceleratedWidget() const override;
|
|
NativeWindowHandle GetNativeWindowHandle() const override;
|
|
void SetProgressBar(double progress, const ProgressState state) override;
|
|
void SetOverlayIcon(const gfx::Image& overlay,
|
|
const std::string& description) override;
|
|
void SetVisibleOnAllWorkspaces(bool visible,
|
|
bool visibleOnFullScreen,
|
|
bool skipTransformProcessType) override;
|
|
bool IsVisibleOnAllWorkspaces() override;
|
|
void SetAutoHideCursor(bool auto_hide) override;
|
|
void SetVibrancy(const std::string& type) override;
|
|
void SetWindowButtonVisibility(bool visible) override;
|
|
bool GetWindowButtonVisibility() const override;
|
|
void SetTrafficLightPosition(absl::optional<gfx::Point> position) override;
|
|
absl::optional<gfx::Point> GetTrafficLightPosition() const override;
|
|
void RedrawTrafficLights() override;
|
|
void UpdateFrame() override;
|
|
void SetTouchBar(
|
|
std::vector<gin_helper::PersistentDictionary> items) override;
|
|
void RefreshTouchBarItem(const std::string& item_id) override;
|
|
void SetEscapeTouchBarItem(gin_helper::PersistentDictionary item) override;
|
|
void SelectPreviousTab() override;
|
|
void SelectNextTab() override;
|
|
void MergeAllWindows() override;
|
|
void MoveTabToNewWindow() override;
|
|
void ToggleTabBar() override;
|
|
bool AddTabbedWindow(NativeWindow* window) override;
|
|
void SetAspectRatio(double aspect_ratio,
|
|
const gfx::Size& extra_size) override;
|
|
void PreviewFile(const std::string& path,
|
|
const std::string& display_name) override;
|
|
void CloseFilePreview() override;
|
|
gfx::Rect ContentBoundsToWindowBounds(const gfx::Rect& bounds) const override;
|
|
gfx::Rect WindowBoundsToContentBounds(const gfx::Rect& bounds) const override;
|
|
void NotifyWindowEnterFullScreen() override;
|
|
void NotifyWindowLeaveFullScreen() override;
|
|
void SetActive(bool is_key) override;
|
|
bool IsActive() const override;
|
|
|
|
void NotifyWindowWillEnterFullScreen();
|
|
void NotifyWindowWillLeaveFullScreen();
|
|
|
|
// Cleanup observers when window is getting closed. Note that the destructor
|
|
// can be called much later after window gets closed, so we should not do
|
|
// cleanup in destructor.
|
|
void Cleanup();
|
|
|
|
// Use a custom content view instead of Chromium's BridgedContentView.
|
|
void OverrideNSWindowContentView();
|
|
|
|
void UpdateVibrancyRadii(bool fullscreen);
|
|
|
|
// Set the attribute of NSWindow while work around a bug of zoom button.
|
|
void SetStyleMask(bool on, NSUInteger flag);
|
|
void SetCollectionBehavior(bool on, NSUInteger flag);
|
|
void SetWindowLevel(int level);
|
|
|
|
enum class FullScreenTransitionState { ENTERING, EXITING, NONE };
|
|
|
|
// Handle fullscreen transitions.
|
|
void SetFullScreenTransitionState(FullScreenTransitionState state);
|
|
void HandlePendingFullscreenTransitions();
|
|
|
|
enum class VisualEffectState {
|
|
kFollowWindow,
|
|
kActive,
|
|
kInactive,
|
|
};
|
|
|
|
enum class TitleBarStyle {
|
|
kNormal,
|
|
kHidden,
|
|
kHiddenInset,
|
|
kCustomButtonsOnHover,
|
|
};
|
|
TitleBarStyle title_bar_style() const { return title_bar_style_; }
|
|
|
|
ElectronPreviewItem* preview_item() const { return preview_item_.get(); }
|
|
ElectronTouchBar* touch_bar() const { return touch_bar_.get(); }
|
|
bool zoom_to_page_width() const { return zoom_to_page_width_; }
|
|
bool always_simple_fullscreen() const { return always_simple_fullscreen_; }
|
|
|
|
protected:
|
|
// views::WidgetDelegate:
|
|
views::View* GetContentsView() override;
|
|
|
|
// ui::NativeThemeObserver:
|
|
void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
|
|
|
|
// display::DisplayObserver:
|
|
void OnDisplayMetricsChanged(const display::Display& display,
|
|
uint32_t changed_metrics) override;
|
|
|
|
private:
|
|
// Add custom layers to the content view.
|
|
void AddContentViewLayers();
|
|
|
|
void InternalSetWindowButtonVisibility(bool visible);
|
|
void InternalSetStandardButtonsVisibility(bool visible);
|
|
void InternalSetParentWindow(NativeWindow* parent, bool attach);
|
|
void SetForwardMouseMessages(bool forward);
|
|
|
|
ElectronNSWindow* window_; // Weak ref, managed by widget_.
|
|
|
|
base::scoped_nsobject<ElectronNSWindowDelegate> window_delegate_;
|
|
base::scoped_nsobject<ElectronPreviewItem> preview_item_;
|
|
base::scoped_nsobject<ElectronTouchBar> touch_bar_;
|
|
base::scoped_nsobject<WindowButtonsView> buttons_view_;
|
|
|
|
// Event monitor for scroll wheel event.
|
|
id wheel_event_monitor_;
|
|
|
|
// The NSView that used as contentView of window.
|
|
//
|
|
// For frameless window it would fill the whole window.
|
|
base::scoped_nsobject<NSView> container_view_;
|
|
|
|
// The views::View that fills the client area.
|
|
std::unique_ptr<RootViewMac> root_view_;
|
|
|
|
bool is_kiosk_ = false;
|
|
bool zoom_to_page_width_ = false;
|
|
absl::optional<gfx::Point> traffic_light_position_;
|
|
|
|
std::queue<bool> pending_transitions_;
|
|
FullScreenTransitionState fullscreen_transition_state() const {
|
|
return fullscreen_transition_state_;
|
|
}
|
|
FullScreenTransitionState fullscreen_transition_state_ =
|
|
FullScreenTransitionState::NONE;
|
|
|
|
NSInteger attention_request_id_ = 0; // identifier from requestUserAttention
|
|
|
|
// The presentation options before entering kiosk mode.
|
|
NSApplicationPresentationOptions kiosk_options_;
|
|
|
|
// The "titleBarStyle" option.
|
|
TitleBarStyle title_bar_style_ = TitleBarStyle::kNormal;
|
|
|
|
// The "visualEffectState" option.
|
|
VisualEffectState visual_effect_state_ = VisualEffectState::kFollowWindow;
|
|
|
|
// The visibility mode of window button controls when explicitly set through
|
|
// setWindowButtonVisibility().
|
|
absl::optional<bool> window_button_visibility_;
|
|
|
|
// Maximizable window state; necessary for persistence through redraws.
|
|
bool maximizable_ = true;
|
|
|
|
// Simple (pre-Lion) Fullscreen Settings
|
|
bool always_simple_fullscreen_ = false;
|
|
bool is_simple_fullscreen_ = false;
|
|
bool was_maximizable_ = false;
|
|
bool was_movable_ = false;
|
|
bool is_active_ = false;
|
|
NSRect original_frame_;
|
|
NSInteger original_level_;
|
|
NSUInteger simple_fullscreen_mask_;
|
|
|
|
std::string vibrancy_type_;
|
|
|
|
// The presentation options before entering simple fullscreen mode.
|
|
NSApplicationPresentationOptions simple_fullscreen_options_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(NativeWindowMac);
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_BROWSER_NATIVE_WINDOW_MAC_H_
|