Browse Source

refactor: make NativeWindow getter methods const (#40887)

refactor: make NativeWindow getter methods const (#40804)

* refactor: make NativeWindow getter methods const

* fixup! refactor: make NativeWindow getter methods const

make GetZOrderLevel() const

* fixup! refactor: make NativeWindow getter methods const

fix oops
Charles Kerr 1 year ago
parent
commit
c257cc25a2

+ 37 - 37
shell/browser/api/electron_api_base_window.cc

@@ -333,7 +333,7 @@ void BaseWindow::Blur() {
   window_->Focus(false);
 }
 
-bool BaseWindow::IsFocused() {
+bool BaseWindow::IsFocused() const {
   return window_->IsFocused();
 }
 
@@ -352,11 +352,11 @@ void BaseWindow::Hide() {
   window_->Hide();
 }
 
-bool BaseWindow::IsVisible() {
+bool BaseWindow::IsVisible() const {
   return window_->IsVisible();
 }
 
-bool BaseWindow::IsEnabled() {
+bool BaseWindow::IsEnabled() const {
   return window_->IsEnabled();
 }
 
@@ -372,7 +372,7 @@ void BaseWindow::Unmaximize() {
   window_->Unmaximize();
 }
 
-bool BaseWindow::IsMaximized() {
+bool BaseWindow::IsMaximized() const {
   return window_->IsMaximized();
 }
 
@@ -384,7 +384,7 @@ void BaseWindow::Restore() {
   window_->Restore();
 }
 
-bool BaseWindow::IsMinimized() {
+bool BaseWindow::IsMinimized() const {
   return window_->IsMinimized();
 }
 
@@ -392,7 +392,7 @@ void BaseWindow::SetFullScreen(bool fullscreen) {
   window_->SetFullScreen(fullscreen);
 }
 
-bool BaseWindow::IsFullscreen() {
+bool BaseWindow::IsFullscreen() const {
   return window_->IsFullscreen();
 }
 
@@ -403,15 +403,15 @@ void BaseWindow::SetBounds(const gfx::Rect& bounds,
   window_->SetBounds(bounds, animate);
 }
 
-gfx::Rect BaseWindow::GetBounds() {
+gfx::Rect BaseWindow::GetBounds() const {
   return window_->GetBounds();
 }
 
-bool BaseWindow::IsNormal() {
+bool BaseWindow::IsNormal() const {
   return window_->IsNormal();
 }
 
-gfx::Rect BaseWindow::GetNormalBounds() {
+gfx::Rect BaseWindow::GetNormalBounds() const {
   return window_->GetNormalBounds();
 }
 
@@ -422,7 +422,7 @@ void BaseWindow::SetContentBounds(const gfx::Rect& bounds,
   window_->SetContentBounds(bounds, animate);
 }
 
-gfx::Rect BaseWindow::GetContentBounds() {
+gfx::Rect BaseWindow::GetContentBounds() const {
   return window_->GetContentBounds();
 }
 
@@ -434,7 +434,7 @@ void BaseWindow::SetSize(int width, int height, gin_helper::Arguments* args) {
   window_->SetSize(size, animate);
 }
 
-std::vector<int> BaseWindow::GetSize() {
+std::vector<int> BaseWindow::GetSize() const {
   std::vector<int> result(2);
   gfx::Size size = window_->GetSize();
   result[0] = size.width();
@@ -450,7 +450,7 @@ void BaseWindow::SetContentSize(int width,
   window_->SetContentSize(gfx::Size(width, height), animate);
 }
 
-std::vector<int> BaseWindow::GetContentSize() {
+std::vector<int> BaseWindow::GetContentSize() const {
   std::vector<int> result(2);
   gfx::Size size = window_->GetContentSize();
   result[0] = size.width();
@@ -462,7 +462,7 @@ void BaseWindow::SetMinimumSize(int width, int height) {
   window_->SetMinimumSize(gfx::Size(width, height));
 }
 
-std::vector<int> BaseWindow::GetMinimumSize() {
+std::vector<int> BaseWindow::GetMinimumSize() const {
   std::vector<int> result(2);
   gfx::Size size = window_->GetMinimumSize();
   result[0] = size.width();
@@ -474,7 +474,7 @@ void BaseWindow::SetMaximumSize(int width, int height) {
   window_->SetMaximumSize(gfx::Size(width, height));
 }
 
-std::vector<int> BaseWindow::GetMaximumSize() {
+std::vector<int> BaseWindow::GetMaximumSize() const {
   std::vector<int> result(2);
   gfx::Size size = window_->GetMaximumSize();
   result[0] = size.width();
@@ -492,7 +492,7 @@ void BaseWindow::SetResizable(bool resizable) {
   window_->SetResizable(resizable);
 }
 
-bool BaseWindow::IsResizable() {
+bool BaseWindow::IsResizable() const {
   return window_->IsResizable();
 }
 
@@ -500,7 +500,7 @@ void BaseWindow::SetMovable(bool movable) {
   window_->SetMovable(movable);
 }
 
-bool BaseWindow::IsMovable() {
+bool BaseWindow::IsMovable() const {
   return window_->IsMovable();
 }
 
@@ -508,7 +508,7 @@ void BaseWindow::SetMinimizable(bool minimizable) {
   window_->SetMinimizable(minimizable);
 }
 
-bool BaseWindow::IsMinimizable() {
+bool BaseWindow::IsMinimizable() const {
   return window_->IsMinimizable();
 }
 
@@ -516,7 +516,7 @@ void BaseWindow::SetMaximizable(bool maximizable) {
   window_->SetMaximizable(maximizable);
 }
 
-bool BaseWindow::IsMaximizable() {
+bool BaseWindow::IsMaximizable() const {
   return window_->IsMaximizable();
 }
 
@@ -524,7 +524,7 @@ void BaseWindow::SetFullScreenable(bool fullscreenable) {
   window_->SetFullScreenable(fullscreenable);
 }
 
-bool BaseWindow::IsFullScreenable() {
+bool BaseWindow::IsFullScreenable() const {
   return window_->IsFullScreenable();
 }
 
@@ -532,7 +532,7 @@ void BaseWindow::SetClosable(bool closable) {
   window_->SetClosable(closable);
 }
 
-bool BaseWindow::IsClosable() {
+bool BaseWindow::IsClosable() const {
   return window_->IsClosable();
 }
 
@@ -547,7 +547,7 @@ void BaseWindow::SetAlwaysOnTop(bool top, gin_helper::Arguments* args) {
   window_->SetAlwaysOnTop(z_order, level, relative_level);
 }
 
-bool BaseWindow::IsAlwaysOnTop() {
+bool BaseWindow::IsAlwaysOnTop() const {
   return window_->GetZOrderLevel() != ui::ZOrderLevel::kNormal;
 }
 
@@ -561,7 +561,7 @@ void BaseWindow::SetPosition(int x, int y, gin_helper::Arguments* args) {
   window_->SetPosition(gfx::Point(x, y), animate);
 }
 
-std::vector<int> BaseWindow::GetPosition() {
+std::vector<int> BaseWindow::GetPosition() const {
   std::vector<int> result(2);
   gfx::Point pos = window_->GetPosition();
   result[0] = pos.x();
@@ -582,7 +582,7 @@ void BaseWindow::SetTitle(const std::string& title) {
   window_->SetTitle(title);
 }
 
-std::string BaseWindow::GetTitle() {
+std::string BaseWindow::GetTitle() const {
   return window_->GetTitle();
 }
 
@@ -590,7 +590,7 @@ void BaseWindow::SetAccessibleTitle(const std::string& title) {
   window_->SetAccessibleTitle(title);
 }
 
-std::string BaseWindow::GetAccessibleTitle() {
+std::string BaseWindow::GetAccessibleTitle() const {
   return window_->GetAccessibleTitle();
 }
 
@@ -606,7 +606,7 @@ void BaseWindow::SetExcludedFromShownWindowsMenu(bool excluded) {
   window_->SetExcludedFromShownWindowsMenu(excluded);
 }
 
-bool BaseWindow::IsExcludedFromShownWindowsMenu() {
+bool BaseWindow::IsExcludedFromShownWindowsMenu() const {
   return window_->IsExcludedFromShownWindowsMenu();
 }
 
@@ -614,7 +614,7 @@ void BaseWindow::SetSimpleFullScreen(bool simple_fullscreen) {
   window_->SetSimpleFullScreen(simple_fullscreen);
 }
 
-bool BaseWindow::IsSimpleFullScreen() {
+bool BaseWindow::IsSimpleFullScreen() const {
   return window_->IsSimpleFullScreen();
 }
 
@@ -622,7 +622,7 @@ void BaseWindow::SetKiosk(bool kiosk) {
   window_->SetKiosk(kiosk);
 }
 
-bool BaseWindow::IsKiosk() {
+bool BaseWindow::IsKiosk() const {
   return window_->IsKiosk();
 }
 
@@ -635,7 +635,7 @@ void BaseWindow::SetBackgroundColor(const std::string& color_name) {
   window_->SetBackgroundColor(color);
 }
 
-std::string BaseWindow::GetBackgroundColor(gin_helper::Arguments* args) {
+std::string BaseWindow::GetBackgroundColor(gin_helper::Arguments* args) const {
   return ToRGBHex(window_->GetBackgroundColor());
 }
 
@@ -647,7 +647,7 @@ void BaseWindow::SetHasShadow(bool has_shadow) {
   window_->SetHasShadow(has_shadow);
 }
 
-bool BaseWindow::HasShadow() {
+bool BaseWindow::HasShadow() const {
   return window_->HasShadow();
 }
 
@@ -655,7 +655,7 @@ void BaseWindow::SetOpacity(const double opacity) {
   window_->SetOpacity(opacity);
 }
 
-double BaseWindow::GetOpacity() {
+double BaseWindow::GetOpacity() const {
   return window_->GetOpacity();
 }
 
@@ -667,7 +667,7 @@ void BaseWindow::SetRepresentedFilename(const std::string& filename) {
   window_->SetRepresentedFilename(filename);
 }
 
-std::string BaseWindow::GetRepresentedFilename() {
+std::string BaseWindow::GetRepresentedFilename() const {
   return window_->GetRepresentedFilename();
 }
 
@@ -675,7 +675,7 @@ void BaseWindow::SetDocumentEdited(bool edited) {
   window_->SetDocumentEdited(edited);
 }
 
-bool BaseWindow::IsDocumentEdited() {
+bool BaseWindow::IsDocumentEdited() const {
   return window_->IsDocumentEdited();
 }
 
@@ -695,7 +695,7 @@ void BaseWindow::SetFocusable(bool focusable) {
   return window_->SetFocusable(focusable);
 }
 
-bool BaseWindow::IsFocusable() {
+bool BaseWindow::IsFocusable() const {
   return window_->IsFocusable();
 }
 
@@ -861,7 +861,7 @@ void BaseWindow::SetVisibleOnAllWorkspaces(bool visible,
                                             skipTransformProcessType);
 }
 
-bool BaseWindow::IsVisibleOnAllWorkspaces() {
+bool BaseWindow::IsVisibleOnAllWorkspaces() const {
   return window_->IsVisibleOnAllWorkspaces();
 }
 
@@ -879,7 +879,7 @@ void BaseWindow::SetBackgroundMaterial(const std::string& material_type) {
 }
 
 #if BUILDFLAG(IS_MAC)
-std::string BaseWindow::GetAlwaysOnTopLevel() {
+std::string BaseWindow::GetAlwaysOnTopLevel() const {
   return window_->GetAlwaysOnTopLevel();
 }
 
@@ -965,7 +965,7 @@ void BaseWindow::SetAutoHideMenuBar(bool auto_hide) {
   window_->SetAutoHideMenuBar(auto_hide);
 }
 
-bool BaseWindow::IsMenuBarAutoHide() {
+bool BaseWindow::IsMenuBarAutoHide() const {
   return window_->IsMenuBarAutoHide();
 }
 
@@ -973,7 +973,7 @@ void BaseWindow::SetMenuBarVisibility(bool visible) {
   window_->SetMenuBarVisibility(visible);
 }
 
-bool BaseWindow::IsMenuBarVisible() {
+bool BaseWindow::IsMenuBarVisible() const {
   return window_->IsMenuBarVisible();
 }
 

+ 37 - 37
shell/browser/api/electron_api_base_window.h

@@ -92,84 +92,84 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   virtual void CloseImmediately();
   virtual void Focus();
   virtual void Blur();
-  bool IsFocused();
+  bool IsFocused() const;
   void Show();
   void ShowInactive();
   void Hide();
-  bool IsVisible();
-  bool IsEnabled();
+  bool IsVisible() const;
+  bool IsEnabled() const;
   void SetEnabled(bool enable);
   void Maximize();
   void Unmaximize();
-  bool IsMaximized();
+  bool IsMaximized() const;
   void Minimize();
   void Restore();
-  bool IsMinimized();
+  bool IsMinimized() const;
   void SetFullScreen(bool fullscreen);
-  bool IsFullscreen();
+  bool IsFullscreen() const;
   void SetBounds(const gfx::Rect& bounds, gin_helper::Arguments* args);
-  gfx::Rect GetBounds();
+  gfx::Rect GetBounds() const;
   void SetSize(int width, int height, gin_helper::Arguments* args);
-  std::vector<int> GetSize();
+  std::vector<int> GetSize() const;
   void SetContentSize(int width, int height, gin_helper::Arguments* args);
-  std::vector<int> GetContentSize();
+  std::vector<int> GetContentSize() const;
   void SetContentBounds(const gfx::Rect& bounds, gin_helper::Arguments* args);
-  gfx::Rect GetContentBounds();
-  bool IsNormal();
-  gfx::Rect GetNormalBounds();
+  gfx::Rect GetContentBounds() const;
+  bool IsNormal() const;
+  gfx::Rect GetNormalBounds() const;
   void SetMinimumSize(int width, int height);
-  std::vector<int> GetMinimumSize();
+  std::vector<int> GetMinimumSize() const;
   void SetMaximumSize(int width, int height);
-  std::vector<int> GetMaximumSize();
+  std::vector<int> GetMaximumSize() const;
   void SetSheetOffset(double offsetY, gin_helper::Arguments* args);
   void SetResizable(bool resizable);
-  bool IsResizable();
+  bool IsResizable() const;
   void SetMovable(bool movable);
   void MoveAbove(const std::string& sourceId, gin_helper::Arguments* args);
   void MoveTop();
-  bool IsMovable();
+  bool IsMovable() const;
   void SetMinimizable(bool minimizable);
-  bool IsMinimizable();
+  bool IsMinimizable() const;
   void SetMaximizable(bool maximizable);
-  bool IsMaximizable();
+  bool IsMaximizable() const;
   void SetFullScreenable(bool fullscreenable);
-  bool IsFullScreenable();
+  bool IsFullScreenable() const;
   void SetClosable(bool closable);
-  bool IsClosable();
+  bool IsClosable() const;
   void SetAlwaysOnTop(bool top, gin_helper::Arguments* args);
-  bool IsAlwaysOnTop();
+  bool IsAlwaysOnTop() const;
   void Center();
   void SetPosition(int x, int y, gin_helper::Arguments* args);
-  std::vector<int> GetPosition();
+  std::vector<int> GetPosition() const;
   void SetTitle(const std::string& title);
-  std::string GetTitle();
+  std::string GetTitle() const;
   void SetAccessibleTitle(const std::string& title);
-  std::string GetAccessibleTitle();
+  std::string GetAccessibleTitle() const;
   void FlashFrame(bool flash);
   void SetSkipTaskbar(bool skip);
   void SetExcludedFromShownWindowsMenu(bool excluded);
-  bool IsExcludedFromShownWindowsMenu();
+  bool IsExcludedFromShownWindowsMenu() const;
   void SetSimpleFullScreen(bool simple_fullscreen);
-  bool IsSimpleFullScreen();
+  bool IsSimpleFullScreen() const;
   void SetKiosk(bool kiosk);
-  bool IsKiosk();
+  bool IsKiosk() const;
   bool IsTabletMode() const;
   virtual void SetBackgroundColor(const std::string& color_name);
-  std::string GetBackgroundColor(gin_helper::Arguments* args);
+  std::string GetBackgroundColor(gin_helper::Arguments* args) const;
   void InvalidateShadow();
   void SetHasShadow(bool has_shadow);
-  bool HasShadow();
+  bool HasShadow() const;
   void SetOpacity(const double opacity);
-  double GetOpacity();
+  double GetOpacity() const;
   void SetShape(const std::vector<gfx::Rect>& rects);
   void SetRepresentedFilename(const std::string& filename);
-  std::string GetRepresentedFilename();
+  std::string GetRepresentedFilename() const;
   void SetDocumentEdited(bool edited);
-  bool IsDocumentEdited();
+  bool IsDocumentEdited() const;
   void SetIgnoreMouseEvents(bool ignore, gin_helper::Arguments* args);
   void SetContentProtection(bool enable);
   void SetFocusable(bool focusable);
-  bool IsFocusable();
+  bool IsFocusable() const;
   void SetMenu(v8::Isolate* isolate, v8::Local<v8::Value> menu);
   void RemoveMenu();
   void SetParentWindow(v8::Local<v8::Value> value, gin_helper::Arguments* args);
@@ -187,13 +187,13 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   void SetOverlayIcon(const gfx::Image& overlay,
                       const std::string& description);
   void SetVisibleOnAllWorkspaces(bool visible, gin_helper::Arguments* args);
-  bool IsVisibleOnAllWorkspaces();
+  bool IsVisibleOnAllWorkspaces() const;
   void SetAutoHideCursor(bool auto_hide);
   virtual void SetVibrancy(v8::Isolate* isolate, v8::Local<v8::Value> value);
   void SetBackgroundMaterial(const std::string& vibrancy);
 
 #if BUILDFLAG(IS_MAC)
-  std::string GetAlwaysOnTopLevel();
+  std::string GetAlwaysOnTopLevel() const;
   void SetWindowButtonVisibility(bool visible);
   bool GetWindowButtonVisibility() const;
   void SetWindowButtonPosition(absl::optional<gfx::Point> position);
@@ -215,9 +215,9 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   void AddTabbedWindow(NativeWindow* window, gin_helper::Arguments* args);
   v8::Local<v8::Value> GetTabbingIdentifier();
   void SetAutoHideMenuBar(bool auto_hide);
-  bool IsMenuBarAutoHide();
+  bool IsMenuBarAutoHide() const;
   void SetMenuBarVisibility(bool visible);
-  bool IsMenuBarVisible();
+  bool IsMenuBarVisible() const;
   void SetAspectRatio(double aspect_ratio, gin_helper::Arguments* args);
   void PreviewFile(const std::string& path, gin_helper::Arguments* args);
   void CloseFilePreview();

+ 14 - 14
shell/browser/native_window.cc

@@ -295,7 +295,7 @@ void NativeWindow::SetSize(const gfx::Size& size, bool animate) {
   SetBounds(gfx::Rect(GetPosition(), size), animate);
 }
 
-gfx::Size NativeWindow::GetSize() {
+gfx::Size NativeWindow::GetSize() const {
   return GetBounds().size();
 }
 
@@ -303,7 +303,7 @@ void NativeWindow::SetPosition(const gfx::Point& position, bool animate) {
   SetBounds(gfx::Rect(position, GetSize()), animate);
 }
 
-gfx::Point NativeWindow::GetPosition() {
+gfx::Point NativeWindow::GetPosition() const {
   return GetBounds().origin();
 }
 
@@ -311,7 +311,7 @@ void NativeWindow::SetContentSize(const gfx::Size& size, bool animate) {
   SetSize(ContentBoundsToWindowBounds(gfx::Rect(size)).size(), animate);
 }
 
-gfx::Size NativeWindow::GetContentSize() {
+gfx::Size NativeWindow::GetContentSize() const {
   return GetContentBounds().size();
 }
 
@@ -319,11 +319,11 @@ void NativeWindow::SetContentBounds(const gfx::Rect& bounds, bool animate) {
   SetBounds(ContentBoundsToWindowBounds(bounds), animate);
 }
 
-gfx::Rect NativeWindow::GetContentBounds() {
+gfx::Rect NativeWindow::GetContentBounds() const {
   return WindowBoundsToContentBounds(GetBounds());
 }
 
-bool NativeWindow::IsNormal() {
+bool NativeWindow::IsNormal() const {
   return !IsMinimized() && !IsMaximized() && !IsFullscreen();
 }
 
@@ -430,11 +430,11 @@ void NativeWindow::SetSheetOffset(const double offsetX, const double offsetY) {
   sheet_offset_y_ = offsetY;
 }
 
-double NativeWindow::GetSheetOffsetX() {
+double NativeWindow::GetSheetOffsetX() const {
   return sheet_offset_x_;
 }
 
-double NativeWindow::GetSheetOffsetY() {
+double NativeWindow::GetSheetOffsetY() const {
   return sheet_offset_y_;
 }
 
@@ -444,19 +444,19 @@ bool NativeWindow::IsTabletMode() const {
 
 void NativeWindow::SetRepresentedFilename(const std::string& filename) {}
 
-std::string NativeWindow::GetRepresentedFilename() {
+std::string NativeWindow::GetRepresentedFilename() const {
   return "";
 }
 
 void NativeWindow::SetDocumentEdited(bool edited) {}
 
-bool NativeWindow::IsDocumentEdited() {
+bool NativeWindow::IsDocumentEdited() const {
   return false;
 }
 
 void NativeWindow::SetFocusable(bool focusable) {}
 
-bool NativeWindow::IsFocusable() {
+bool NativeWindow::IsFocusable() const {
   return false;
 }
 
@@ -508,21 +508,21 @@ void NativeWindow::SetEscapeTouchBarItem(
 
 void NativeWindow::SetAutoHideMenuBar(bool auto_hide) {}
 
-bool NativeWindow::IsMenuBarAutoHide() {
+bool NativeWindow::IsMenuBarAutoHide() const {
   return false;
 }
 
 void NativeWindow::SetMenuBarVisibility(bool visible) {}
 
-bool NativeWindow::IsMenuBarVisible() {
+bool NativeWindow::IsMenuBarVisible() const {
   return true;
 }
 
-double NativeWindow::GetAspectRatio() {
+double NativeWindow::GetAspectRatio() const {
   return aspect_ratio_;
 }
 
-gfx::Size NativeWindow::GetAspectRatioExtraSize() {
+gfx::Size NativeWindow::GetAspectRatioExtraSize() const {
   return aspect_ratio_extraSize_;
 }
 

+ 38 - 38
shell/browser/native_window.h

@@ -82,33 +82,33 @@ class NativeWindow : public base::SupportsUserData,
   virtual void CloseImmediately() = 0;
   virtual bool IsClosed() const;
   virtual void Focus(bool focus) = 0;
-  virtual bool IsFocused() = 0;
+  virtual bool IsFocused() const = 0;
   virtual void Show() = 0;
   virtual void ShowInactive() = 0;
   virtual void Hide() = 0;
-  virtual bool IsVisible() = 0;
-  virtual bool IsEnabled() = 0;
+  virtual bool IsVisible() const = 0;
+  virtual bool IsEnabled() const = 0;
   virtual void SetEnabled(bool enable) = 0;
   virtual void Maximize() = 0;
   virtual void Unmaximize() = 0;
-  virtual bool IsMaximized() = 0;
+  virtual bool IsMaximized() const = 0;
   virtual void Minimize() = 0;
   virtual void Restore() = 0;
-  virtual bool IsMinimized() = 0;
+  virtual bool IsMinimized() const = 0;
   virtual void SetFullScreen(bool fullscreen) = 0;
   virtual bool IsFullscreen() const = 0;
   virtual void SetBounds(const gfx::Rect& bounds, bool animate = false) = 0;
-  virtual gfx::Rect GetBounds() = 0;
+  virtual gfx::Rect GetBounds() const = 0;
   virtual void SetSize(const gfx::Size& size, bool animate = false);
-  virtual gfx::Size GetSize();
+  virtual gfx::Size GetSize() const;
   virtual void SetPosition(const gfx::Point& position, bool animate = false);
-  virtual gfx::Point GetPosition();
+  virtual gfx::Point GetPosition() const;
   virtual void SetContentSize(const gfx::Size& size, bool animate = false);
-  virtual gfx::Size GetContentSize();
+  virtual gfx::Size GetContentSize() const;
   virtual void SetContentBounds(const gfx::Rect& bounds, bool animate = false);
-  virtual gfx::Rect GetContentBounds();
-  virtual bool IsNormal();
-  virtual gfx::Rect GetNormalBounds() = 0;
+  virtual gfx::Rect GetContentBounds() const;
+  virtual bool IsNormal() const;
+  virtual gfx::Rect GetNormalBounds() const = 0;
   virtual void SetSizeConstraints(
       const extensions::SizeConstraints& window_constraints);
   virtual extensions::SizeConstraints GetSizeConstraints() const;
@@ -122,32 +122,32 @@ class NativeWindow : public base::SupportsUserData,
   virtual gfx::Size GetContentMinimumSize() const;
   virtual gfx::Size GetContentMaximumSize() const;
   virtual void SetSheetOffset(const double offsetX, const double offsetY);
-  virtual double GetSheetOffsetX();
-  virtual double GetSheetOffsetY();
+  virtual double GetSheetOffsetX() const;
+  virtual double GetSheetOffsetY() const;
   virtual void SetResizable(bool resizable) = 0;
   virtual bool MoveAbove(const std::string& sourceId) = 0;
   virtual void MoveTop() = 0;
-  virtual bool IsResizable() = 0;
+  virtual bool IsResizable() const = 0;
   virtual void SetMovable(bool movable) = 0;
-  virtual bool IsMovable() = 0;
+  virtual bool IsMovable() const = 0;
   virtual void SetMinimizable(bool minimizable) = 0;
-  virtual bool IsMinimizable() = 0;
+  virtual bool IsMinimizable() const = 0;
   virtual void SetMaximizable(bool maximizable) = 0;
-  virtual bool IsMaximizable() = 0;
+  virtual bool IsMaximizable() const = 0;
   virtual void SetFullScreenable(bool fullscreenable) = 0;
-  virtual bool IsFullScreenable() = 0;
+  virtual bool IsFullScreenable() const = 0;
   virtual void SetClosable(bool closable) = 0;
-  virtual bool IsClosable() = 0;
+  virtual bool IsClosable() const = 0;
   virtual void SetAlwaysOnTop(ui::ZOrderLevel z_order,
                               const std::string& level = "floating",
                               int relativeLevel = 0) = 0;
-  virtual ui::ZOrderLevel GetZOrderLevel() = 0;
+  virtual ui::ZOrderLevel GetZOrderLevel() const = 0;
   virtual void Center() = 0;
   virtual void Invalidate() = 0;
   virtual void SetTitle(const std::string& title) = 0;
-  virtual std::string GetTitle() = 0;
+  virtual std::string GetTitle() const = 0;
 #if BUILDFLAG(IS_MAC)
-  virtual std::string GetAlwaysOnTopLevel() = 0;
+  virtual std::string GetAlwaysOnTopLevel() const = 0;
   virtual void SetActive(bool is_key) = 0;
   virtual bool IsActive() const = 0;
   virtual void RemoveChildFromParentWindow() = 0;
@@ -163,27 +163,27 @@ class NativeWindow : public base::SupportsUserData,
   virtual void FlashFrame(bool flash) = 0;
   virtual void SetSkipTaskbar(bool skip) = 0;
   virtual void SetExcludedFromShownWindowsMenu(bool excluded) = 0;
-  virtual bool IsExcludedFromShownWindowsMenu() = 0;
+  virtual bool IsExcludedFromShownWindowsMenu() const = 0;
   virtual void SetSimpleFullScreen(bool simple_fullscreen) = 0;
-  virtual bool IsSimpleFullScreen() = 0;
+  virtual bool IsSimpleFullScreen() const = 0;
   virtual void SetKiosk(bool kiosk) = 0;
-  virtual bool IsKiosk() = 0;
+  virtual bool IsKiosk() const = 0;
   virtual bool IsTabletMode() const;
   virtual void SetBackgroundColor(SkColor color) = 0;
-  virtual SkColor GetBackgroundColor() = 0;
+  virtual SkColor GetBackgroundColor() const = 0;
   virtual void InvalidateShadow();
   virtual void SetHasShadow(bool has_shadow) = 0;
-  virtual bool HasShadow() = 0;
+  virtual bool HasShadow() const = 0;
   virtual void SetOpacity(const double opacity) = 0;
-  virtual double GetOpacity() = 0;
+  virtual double GetOpacity() const = 0;
   virtual void SetRepresentedFilename(const std::string& filename);
-  virtual std::string GetRepresentedFilename();
+  virtual std::string GetRepresentedFilename() const;
   virtual void SetDocumentEdited(bool edited);
-  virtual bool IsDocumentEdited();
+  virtual bool IsDocumentEdited() const;
   virtual void SetIgnoreMouseEvents(bool ignore, bool forward) = 0;
   virtual void SetContentProtection(bool enable) = 0;
   virtual void SetFocusable(bool focusable);
-  virtual bool IsFocusable();
+  virtual bool IsFocusable() const;
   virtual void SetMenu(ElectronMenuModel* menu);
   virtual void SetParentWindow(NativeWindow* parent);
   virtual void AddBrowserView(NativeBrowserView* browser_view) = 0;
@@ -214,7 +214,7 @@ class NativeWindow : public base::SupportsUserData,
       bool visibleOnFullScreen = false,
       bool skipTransformProcessType = false) = 0;
 
-  virtual bool IsVisibleOnAllWorkspaces() = 0;
+  virtual bool IsVisibleOnAllWorkspaces() const = 0;
 
   virtual void SetAutoHideCursor(bool auto_hide);
 
@@ -239,7 +239,7 @@ class NativeWindow : public base::SupportsUserData,
 
 // whether windows should be ignored by mission control
 #if BUILDFLAG(IS_MAC)
-  virtual bool IsHiddenInMissionControl() = 0;
+  virtual bool IsHiddenInMissionControl() const = 0;
   virtual void SetHiddenInMissionControl(bool hidden) = 0;
 #endif
 
@@ -260,13 +260,13 @@ class NativeWindow : public base::SupportsUserData,
 
   // Toggle the menu bar.
   virtual void SetAutoHideMenuBar(bool auto_hide);
-  virtual bool IsMenuBarAutoHide();
+  virtual bool IsMenuBarAutoHide() const;
   virtual void SetMenuBarVisibility(bool visible);
-  virtual bool IsMenuBarVisible();
+  virtual bool IsMenuBarVisible() const;
 
   // Set the aspect ratio when resizing window.
-  double GetAspectRatio();
-  gfx::Size GetAspectRatioExtraSize();
+  double GetAspectRatio() const;
+  gfx::Size GetAspectRatioExtraSize() const;
   virtual void SetAspectRatio(double aspect_ratio, const gfx::Size& extra_size);
 
   // File preview APIs.

+ 28 - 28
shell/browser/native_window_mac.h

@@ -39,25 +39,25 @@ class NativeWindowMac : public NativeWindow,
   void Close() override;
   void CloseImmediately() override;
   void Focus(bool focus) override;
-  bool IsFocused() override;
+  bool IsFocused() const override;
   void Show() override;
   void ShowInactive() override;
   void Hide() override;
-  bool IsVisible() override;
-  bool IsEnabled() override;
+  bool IsVisible() const override;
+  bool IsEnabled() const override;
   void SetEnabled(bool enable) override;
   void Maximize() override;
   void Unmaximize() override;
-  bool IsMaximized() override;
+  bool IsMaximized() const override;
   void Minimize() override;
   void Restore() override;
-  bool IsMinimized() override;
+  bool IsMinimized() const 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;
+  gfx::Rect GetBounds() const override;
+  bool IsNormal() const override;
+  gfx::Rect GetNormalBounds() const override;
   void SetSizeConstraints(
       const extensions::SizeConstraints& window_constraints) override;
   void SetContentSizeConstraints(
@@ -65,51 +65,51 @@ class NativeWindowMac : public NativeWindow,
   void SetResizable(bool resizable) override;
   bool MoveAbove(const std::string& sourceId) override;
   void MoveTop() override;
-  bool IsResizable() override;
+  bool IsResizable() const override;
   void SetMovable(bool movable) override;
-  bool IsMovable() override;
+  bool IsMovable() const override;
   void SetMinimizable(bool minimizable) override;
-  bool IsMinimizable() override;
+  bool IsMinimizable() const override;
   void SetMaximizable(bool maximizable) override;
-  bool IsMaximizable() override;
+  bool IsMaximizable() const override;
   void SetFullScreenable(bool fullscreenable) override;
-  bool IsFullScreenable() override;
+  bool IsFullScreenable() const override;
   void SetClosable(bool closable) override;
-  bool IsClosable() override;
+  bool IsClosable() const override;
   void SetAlwaysOnTop(ui::ZOrderLevel z_order,
                       const std::string& level,
                       int relative_level) override;
-  std::string GetAlwaysOnTopLevel() override;
-  ui::ZOrderLevel GetZOrderLevel() override;
+  std::string GetAlwaysOnTopLevel() const override;
+  ui::ZOrderLevel GetZOrderLevel() const override;
   void Center() override;
   void Invalidate() override;
   void SetTitle(const std::string& title) override;
-  std::string GetTitle() override;
+  std::string GetTitle() const override;
   void FlashFrame(bool flash) override;
   void SetSkipTaskbar(bool skip) override;
   void SetExcludedFromShownWindowsMenu(bool excluded) override;
-  bool IsExcludedFromShownWindowsMenu() override;
+  bool IsExcludedFromShownWindowsMenu() const override;
   void SetSimpleFullScreen(bool simple_fullscreen) override;
-  bool IsSimpleFullScreen() override;
+  bool IsSimpleFullScreen() const override;
   void SetKiosk(bool kiosk) override;
-  bool IsKiosk() override;
+  bool IsKiosk() const override;
   void SetBackgroundColor(SkColor color) override;
-  SkColor GetBackgroundColor() override;
+  SkColor GetBackgroundColor() const override;
   void InvalidateShadow() override;
   void SetHasShadow(bool has_shadow) override;
-  bool HasShadow() override;
+  bool HasShadow() const override;
   void SetOpacity(const double opacity) override;
-  double GetOpacity() override;
+  double GetOpacity() const override;
   void SetRepresentedFilename(const std::string& filename) override;
-  std::string GetRepresentedFilename() override;
+  std::string GetRepresentedFilename() const override;
   void SetDocumentEdited(bool edited) override;
-  bool IsDocumentEdited() override;
+  bool IsDocumentEdited() const override;
   void SetIgnoreMouseEvents(bool ignore, bool forward) override;
-  bool IsHiddenInMissionControl() override;
+  bool IsHiddenInMissionControl() const override;
   void SetHiddenInMissionControl(bool hidden) override;
   void SetContentProtection(bool enable) override;
   void SetFocusable(bool focusable) override;
-  bool IsFocusable() override;
+  bool IsFocusable() const override;
   void AddBrowserView(NativeBrowserView* browser_view) override;
   void RemoveBrowserView(NativeBrowserView* browser_view) override;
   void SetTopBrowserView(NativeBrowserView* browser_view) override;
@@ -125,7 +125,7 @@ class NativeWindowMac : public NativeWindow,
   void SetVisibleOnAllWorkspaces(bool visible,
                                  bool visibleOnFullScreen,
                                  bool skipTransformProcessType) override;
-  bool IsVisibleOnAllWorkspaces() override;
+  bool IsVisibleOnAllWorkspaces() const override;
   void SetAutoHideCursor(bool auto_hide) override;
   void SetVibrancy(const std::string& type) override;
   void SetWindowButtonVisibility(bool visible) override;

+ 28 - 28
shell/browser/native_window_mac.mm

@@ -506,7 +506,7 @@ void NativeWindowMac::Focus(bool focus) {
   }
 }
 
-bool NativeWindowMac::IsFocused() {
+bool NativeWindowMac::IsFocused() const {
   return [window_ isKeyWindow];
 }
 
@@ -569,12 +569,12 @@ void NativeWindowMac::Hide() {
   [window_ orderOut:nil];
 }
 
-bool NativeWindowMac::IsVisible() {
+bool NativeWindowMac::IsVisible() const {
   bool occluded = [window_ occlusionState] == NSWindowOcclusionStateVisible;
   return [window_ isVisible] && !occluded && !IsMinimized();
 }
 
-bool NativeWindowMac::IsEnabled() {
+bool NativeWindowMac::IsEnabled() const {
   return [window_ attachedSheet] == nil;
 }
 
@@ -637,7 +637,7 @@ void NativeWindowMac::Unmaximize() {
   [window_ zoom:nil];
 }
 
-bool NativeWindowMac::IsMaximized() {
+bool NativeWindowMac::IsMaximized() const {
   // It's possible for [window_ isZoomed] to be true
   // when the window is minimized or fullscreened.
   if (IsMinimized() || IsFullscreen())
@@ -667,7 +667,7 @@ void NativeWindowMac::Restore() {
   [window_ deminiaturize:nil];
 }
 
-bool NativeWindowMac::IsMinimized() {
+bool NativeWindowMac::IsMinimized() const {
   return [window_ isMiniaturized];
 }
 
@@ -782,7 +782,7 @@ void NativeWindowMac::SetBounds(const gfx::Rect& bounds, bool animate) {
   UpdateWindowOriginalFrame();
 }
 
-gfx::Rect NativeWindowMac::GetBounds() {
+gfx::Rect NativeWindowMac::GetBounds() const {
   NSRect frame = [window_ frame];
   gfx::Rect bounds(frame.origin.x, 0, NSWidth(frame), NSHeight(frame));
   NSScreen* screen = [[NSScreen screens] firstObject];
@@ -790,11 +790,11 @@ gfx::Rect NativeWindowMac::GetBounds() {
   return bounds;
 }
 
-bool NativeWindowMac::IsNormal() {
+bool NativeWindowMac::IsNormal() const {
   return NativeWindow::IsNormal() && !IsSimpleFullScreen();
 }
 
-gfx::Rect NativeWindowMac::GetNormalBounds() {
+gfx::Rect NativeWindowMac::GetNormalBounds() const {
   if (IsNormal()) {
     return GetBounds();
   }
@@ -891,7 +891,7 @@ void NativeWindowMac::SetResizable(bool resizable) {
       setEnabled:resizable ? was_fullscreenable : false];
 }
 
-bool NativeWindowMac::IsResizable() {
+bool NativeWindowMac::IsResizable() const {
   bool in_fs_transition =
       fullscreen_transition_state() != FullScreenTransitionState::kNone;
   bool has_rs_mask = HasStyleMask(NSWindowStyleMaskResizable);
@@ -902,7 +902,7 @@ void NativeWindowMac::SetMovable(bool movable) {
   [window_ setMovable:movable];
 }
 
-bool NativeWindowMac::IsMovable() {
+bool NativeWindowMac::IsMovable() const {
   return [window_ isMovable];
 }
 
@@ -910,7 +910,7 @@ void NativeWindowMac::SetMinimizable(bool minimizable) {
   SetStyleMask(minimizable, NSWindowStyleMaskMiniaturizable);
 }
 
-bool NativeWindowMac::IsMinimizable() {
+bool NativeWindowMac::IsMinimizable() const {
   return HasStyleMask(NSWindowStyleMaskMiniaturizable);
 }
 
@@ -919,7 +919,7 @@ void NativeWindowMac::SetMaximizable(bool maximizable) {
   [[window_ standardWindowButton:NSWindowZoomButton] setEnabled:maximizable];
 }
 
-bool NativeWindowMac::IsMaximizable() {
+bool NativeWindowMac::IsMaximizable() const {
   return [[window_ standardWindowButton:NSWindowZoomButton] isEnabled];
 }
 
@@ -931,7 +931,7 @@ void NativeWindowMac::SetFullScreenable(bool fullscreenable) {
                         NSWindowCollectionBehaviorFullScreenAuxiliary);
 }
 
-bool NativeWindowMac::IsFullScreenable() {
+bool NativeWindowMac::IsFullScreenable() const {
   NSUInteger collectionBehavior = [window_ collectionBehavior];
   return collectionBehavior & NSWindowCollectionBehaviorFullScreenPrimary;
 }
@@ -940,7 +940,7 @@ void NativeWindowMac::SetClosable(bool closable) {
   SetStyleMask(closable, NSWindowStyleMaskClosable);
 }
 
-bool NativeWindowMac::IsClosable() {
+bool NativeWindowMac::IsClosable() const {
   return HasStyleMask(NSWindowStyleMaskClosable);
 }
 
@@ -972,7 +972,7 @@ void NativeWindowMac::SetAlwaysOnTop(ui::ZOrderLevel z_order,
   SetWindowLevel(level + relative_level);
 }
 
-std::string NativeWindowMac::GetAlwaysOnTopLevel() {
+std::string NativeWindowMac::GetAlwaysOnTopLevel() const {
   std::string level_name = "normal";
 
   int level = [window_ level];
@@ -1023,7 +1023,7 @@ void NativeWindowMac::SetWindowLevel(int unbounded_level) {
     NativeWindow::NotifyWindowAlwaysOnTopChanged();
 }
 
-ui::ZOrderLevel NativeWindowMac::GetZOrderLevel() {
+ui::ZOrderLevel NativeWindowMac::GetZOrderLevel() const {
   return widget()->GetZOrderLevel();
 }
 
@@ -1041,7 +1041,7 @@ void NativeWindowMac::SetTitle(const std::string& title) {
     [buttons_proxy_ redraw];
 }
 
-std::string NativeWindowMac::GetTitle() {
+std::string NativeWindowMac::GetTitle() const {
   return base::SysNSStringToUTF8([window_ title]);
 }
 
@@ -1056,7 +1056,7 @@ void NativeWindowMac::FlashFrame(bool flash) {
 
 void NativeWindowMac::SetSkipTaskbar(bool skip) {}
 
-bool NativeWindowMac::IsExcludedFromShownWindowsMenu() {
+bool NativeWindowMac::IsExcludedFromShownWindowsMenu() const {
   NSWindow* window = GetNativeWindow().GetNativeNSWindow();
   return [window isExcludedFromWindowsMenu];
 }
@@ -1162,7 +1162,7 @@ void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
   }
 }
 
-bool NativeWindowMac::IsSimpleFullScreen() {
+bool NativeWindowMac::IsSimpleFullScreen() const {
   return is_simple_fullscreen_;
 }
 
@@ -1193,7 +1193,7 @@ void NativeWindowMac::SetKiosk(bool kiosk) {
   }
 }
 
-bool NativeWindowMac::IsKiosk() {
+bool NativeWindowMac::IsKiosk() const {
   return is_kiosk_;
 }
 
@@ -1203,7 +1203,7 @@ void NativeWindowMac::SetBackgroundColor(SkColor color) {
   [[[window_ contentView] layer] setBackgroundColor:cgcolor.get()];
 }
 
-SkColor NativeWindowMac::GetBackgroundColor() {
+SkColor NativeWindowMac::GetBackgroundColor() const {
   CGColorRef color = [[[window_ contentView] layer] backgroundColor];
   if (!color)
     return SK_ColorTRANSPARENT;
@@ -1214,7 +1214,7 @@ void NativeWindowMac::SetHasShadow(bool has_shadow) {
   [window_ setHasShadow:has_shadow];
 }
 
-bool NativeWindowMac::HasShadow() {
+bool NativeWindowMac::HasShadow() const {
   return [window_ hasShadow];
 }
 
@@ -1227,7 +1227,7 @@ void NativeWindowMac::SetOpacity(const double opacity) {
   [window_ setAlphaValue:boundedOpacity];
 }
 
-double NativeWindowMac::GetOpacity() {
+double NativeWindowMac::GetOpacity() const {
   return [window_ alphaValue];
 }
 
@@ -1237,7 +1237,7 @@ void NativeWindowMac::SetRepresentedFilename(const std::string& filename) {
     [buttons_proxy_ redraw];
 }
 
-std::string NativeWindowMac::GetRepresentedFilename() {
+std::string NativeWindowMac::GetRepresentedFilename() const {
   return base::SysNSStringToUTF8([window_ representedFilename]);
 }
 
@@ -1247,11 +1247,11 @@ void NativeWindowMac::SetDocumentEdited(bool edited) {
     [buttons_proxy_ redraw];
 }
 
-bool NativeWindowMac::IsDocumentEdited() {
+bool NativeWindowMac::IsDocumentEdited() const {
   return [window_ isDocumentEdited];
 }
 
-bool NativeWindowMac::IsHiddenInMissionControl() {
+bool NativeWindowMac::IsHiddenInMissionControl() const {
   NSUInteger collectionBehavior = [window_ collectionBehavior];
   return collectionBehavior & NSWindowCollectionBehaviorTransient;
 }
@@ -1281,7 +1281,7 @@ void NativeWindowMac::SetFocusable(bool focusable) {
   [window_ setDisableKeyOrMainWindow:!focusable];
 }
 
-bool NativeWindowMac::IsFocusable() {
+bool NativeWindowMac::IsFocusable() const {
   return ![window_ disableKeyOrMainWindow];
 }
 
@@ -1446,7 +1446,7 @@ void NativeWindowMac::SetVisibleOnAllWorkspaces(bool visible,
                         NSWindowCollectionBehaviorFullScreenAuxiliary);
 }
 
-bool NativeWindowMac::IsVisibleOnAllWorkspaces() {
+bool NativeWindowMac::IsVisibleOnAllWorkspaces() const {
   NSUInteger collectionBehavior = [window_ collectionBehavior];
   return collectionBehavior & NSWindowCollectionBehaviorCanJoinAllSpaces;
 }

+ 28 - 28
shell/browser/native_window_views.cc

@@ -502,7 +502,7 @@ void NativeWindowViews::Focus(bool focus) {
   }
 }
 
-bool NativeWindowViews::IsFocused() {
+bool NativeWindowViews::IsFocused() const {
   return widget()->IsActive();
 }
 
@@ -562,7 +562,7 @@ void NativeWindowViews::Hide() {
 #endif
 }
 
-bool NativeWindowViews::IsVisible() {
+bool NativeWindowViews::IsVisible() const {
 #if BUILDFLAG(IS_WIN)
   // widget()->IsVisible() calls ::IsWindowVisible, which returns non-zero if a
   // window or any of its parent windows are visible. We want to only check the
@@ -576,7 +576,7 @@ bool NativeWindowViews::IsVisible() {
 #endif
 }
 
-bool NativeWindowViews::IsEnabled() {
+bool NativeWindowViews::IsEnabled() const {
 #if BUILDFLAG(IS_WIN)
   return ::IsWindowEnabled(GetAcceleratedWidget());
 #elif BUILDFLAG(IS_LINUX)
@@ -606,7 +606,7 @@ void NativeWindowViews::SetEnabled(bool enable) {
   }
 }
 
-bool NativeWindowViews::ShouldBeEnabled() {
+bool NativeWindowViews::ShouldBeEnabled() const {
   return is_enabled_ && (num_modal_children_ == 0);
 }
 
@@ -666,7 +666,7 @@ void NativeWindowViews::Unmaximize() {
   }
 }
 
-bool NativeWindowViews::IsMaximized() {
+bool NativeWindowViews::IsMaximized() const {
   if (widget()->IsMaximized()) {
     return true;
   } else {
@@ -701,7 +701,7 @@ void NativeWindowViews::Restore() {
 #endif
 }
 
-bool NativeWindowViews::IsMinimized() {
+bool NativeWindowViews::IsMinimized() const {
   return widget()->IsMinimized();
 }
 
@@ -787,7 +787,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
   widget()->SetBounds(bounds);
 }
 
-gfx::Rect NativeWindowViews::GetBounds() {
+gfx::Rect NativeWindowViews::GetBounds() const {
 #if BUILDFLAG(IS_WIN)
   if (IsMinimized())
     return widget()->GetRestoredBounds();
@@ -796,11 +796,11 @@ gfx::Rect NativeWindowViews::GetBounds() {
   return widget()->GetWindowBoundsInScreen();
 }
 
-gfx::Rect NativeWindowViews::GetContentBounds() {
+gfx::Rect NativeWindowViews::GetContentBounds() const {
   return content_view() ? content_view()->GetBoundsInScreen() : gfx::Rect();
 }
 
-gfx::Size NativeWindowViews::GetContentSize() {
+gfx::Size NativeWindowViews::GetContentSize() const {
 #if BUILDFLAG(IS_WIN)
   if (IsMinimized())
     return NativeWindow::GetContentSize();
@@ -809,7 +809,7 @@ gfx::Size NativeWindowViews::GetContentSize() {
   return content_view() ? content_view()->size() : gfx::Size();
 }
 
-gfx::Rect NativeWindowViews::GetNormalBounds() {
+gfx::Rect NativeWindowViews::GetNormalBounds() const {
 #if BUILDFLAG(IS_WIN)
   if (IsMaximized() && transparent())
     return restore_bounds_;
@@ -923,7 +923,7 @@ void NativeWindowViews::MoveTop() {
 #endif
 }
 
-bool NativeWindowViews::IsResizable() {
+bool NativeWindowViews::IsResizable() const {
 #if BUILDFLAG(IS_WIN)
   if (has_frame())
     return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME;
@@ -945,7 +945,7 @@ void NativeWindowViews::SetMovable(bool movable) {
   movable_ = movable;
 }
 
-bool NativeWindowViews::IsMovable() {
+bool NativeWindowViews::IsMovable() const {
 #if BUILDFLAG(IS_WIN)
   return movable_;
 #else
@@ -965,7 +965,7 @@ void NativeWindowViews::SetMinimizable(bool minimizable) {
   minimizable_ = minimizable;
 }
 
-bool NativeWindowViews::IsMinimizable() {
+bool NativeWindowViews::IsMinimizable() const {
 #if BUILDFLAG(IS_WIN)
   return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MINIMIZEBOX;
 #else
@@ -985,7 +985,7 @@ void NativeWindowViews::SetMaximizable(bool maximizable) {
   maximizable_ = maximizable;
 }
 
-bool NativeWindowViews::IsMaximizable() {
+bool NativeWindowViews::IsMaximizable() const {
 #if BUILDFLAG(IS_WIN)
   return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MAXIMIZEBOX;
 #else
@@ -995,7 +995,7 @@ bool NativeWindowViews::IsMaximizable() {
 
 void NativeWindowViews::SetExcludedFromShownWindowsMenu(bool excluded) {}
 
-bool NativeWindowViews::IsExcludedFromShownWindowsMenu() {
+bool NativeWindowViews::IsExcludedFromShownWindowsMenu() const {
   // return false on unsupported platforms
   return false;
 }
@@ -1004,7 +1004,7 @@ void NativeWindowViews::SetFullScreenable(bool fullscreenable) {
   fullscreenable_ = fullscreenable;
 }
 
-bool NativeWindowViews::IsFullScreenable() {
+bool NativeWindowViews::IsFullScreenable() const {
   return fullscreenable_;
 }
 
@@ -1024,7 +1024,7 @@ void NativeWindowViews::SetClosable(bool closable) {
 #endif
 }
 
-bool NativeWindowViews::IsClosable() {
+bool NativeWindowViews::IsClosable() const {
 #if BUILDFLAG(IS_WIN)
   HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
   MENUITEMINFO info;
@@ -1065,7 +1065,7 @@ void NativeWindowViews::SetAlwaysOnTop(ui::ZOrderLevel z_order,
     NativeWindow::NotifyWindowAlwaysOnTopChanged();
 }
 
-ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() {
+ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() const {
   return widget()->GetZOrderLevel();
 }
 
@@ -1082,7 +1082,7 @@ void NativeWindowViews::SetTitle(const std::string& title) {
   widget()->UpdateWindowTitle();
 }
 
-std::string NativeWindowViews::GetTitle() {
+std::string NativeWindowViews::GetTitle() const {
   return title_;
 }
 
@@ -1123,7 +1123,7 @@ void NativeWindowViews::SetSimpleFullScreen(bool simple_fullscreen) {
   SetFullScreen(simple_fullscreen);
 }
 
-bool NativeWindowViews::IsSimpleFullScreen() {
+bool NativeWindowViews::IsSimpleFullScreen() const {
   return IsFullscreen();
 }
 
@@ -1131,7 +1131,7 @@ void NativeWindowViews::SetKiosk(bool kiosk) {
   SetFullScreen(kiosk);
 }
 
-bool NativeWindowViews::IsKiosk() {
+bool NativeWindowViews::IsKiosk() const {
   return IsFullscreen();
 }
 
@@ -1143,7 +1143,7 @@ bool NativeWindowViews::IsTabletMode() const {
 #endif
 }
 
-SkColor NativeWindowViews::GetBackgroundColor() {
+SkColor NativeWindowViews::GetBackgroundColor() const {
   auto* background = root_view_.background();
   if (!background)
     return SK_ColorTRANSPARENT;
@@ -1172,7 +1172,7 @@ void NativeWindowViews::SetHasShadow(bool has_shadow) {
                                     : wm::kShadowElevationNone);
 }
 
-bool NativeWindowViews::HasShadow() {
+bool NativeWindowViews::HasShadow() const {
   return GetNativeWindow()->GetProperty(wm::kShadowElevationKey) !=
          wm::kShadowElevationNone;
 }
@@ -1194,7 +1194,7 @@ void NativeWindowViews::SetOpacity(const double opacity) {
 #endif
 }
 
-double NativeWindowViews::GetOpacity() {
+double NativeWindowViews::GetOpacity() const {
   return opacity_;
 }
 
@@ -1271,7 +1271,7 @@ void NativeWindowViews::SetFocusable(bool focusable) {
 #endif
 }
 
-bool NativeWindowViews::IsFocusable() {
+bool NativeWindowViews::IsFocusable() const {
   bool can_activate = widget()->widget_delegate()->CanActivate();
 #if BUILDFLAG(IS_WIN)
   LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
@@ -1448,7 +1448,7 @@ void NativeWindowViews::SetAutoHideMenuBar(bool auto_hide) {
   root_view_.SetAutoHideMenuBar(auto_hide);
 }
 
-bool NativeWindowViews::IsMenuBarAutoHide() {
+bool NativeWindowViews::IsMenuBarAutoHide() const {
   return root_view_.IsMenuBarAutoHide();
 }
 
@@ -1456,7 +1456,7 @@ void NativeWindowViews::SetMenuBarVisibility(bool visible) {
   root_view_.SetMenuBarVisibility(visible);
 }
 
-bool NativeWindowViews::IsMenuBarVisible() {
+bool NativeWindowViews::IsMenuBarVisible() const {
   return root_view_.IsMenuBarVisible();
 }
 
@@ -1498,7 +1498,7 @@ void NativeWindowViews::SetVisibleOnAllWorkspaces(
   widget()->SetVisibleOnAllWorkspaces(visible);
 }
 
-bool NativeWindowViews::IsVisibleOnAllWorkspaces() {
+bool NativeWindowViews::IsVisibleOnAllWorkspaces() const {
 #if BUILDFLAG(IS_LINUX)
   if (IsX11()) {
     // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to

+ 28 - 28
shell/browser/native_window_views.h

@@ -49,27 +49,27 @@ class NativeWindowViews : public NativeWindow,
   void Close() override;
   void CloseImmediately() override;
   void Focus(bool focus) override;
-  bool IsFocused() override;
+  bool IsFocused() const override;
   void Show() override;
   void ShowInactive() override;
   void Hide() override;
-  bool IsVisible() override;
-  bool IsEnabled() override;
+  bool IsVisible() const override;
+  bool IsEnabled() const override;
   void SetEnabled(bool enable) override;
   void Maximize() override;
   void Unmaximize() override;
-  bool IsMaximized() override;
+  bool IsMaximized() const override;
   void Minimize() override;
   void Restore() override;
-  bool IsMinimized() override;
+  bool IsMinimized() const override;
   void SetFullScreen(bool fullscreen) override;
   bool IsFullscreen() const override;
   void SetBounds(const gfx::Rect& bounds, bool animate) override;
-  gfx::Rect GetBounds() override;
-  gfx::Rect GetContentBounds() override;
-  gfx::Size GetContentSize() override;
-  gfx::Rect GetNormalBounds() override;
-  SkColor GetBackgroundColor() override;
+  gfx::Rect GetBounds() const override;
+  gfx::Rect GetContentBounds() const override;
+  gfx::Size GetContentSize() const override;
+  gfx::Rect GetNormalBounds() const override;
+  SkColor GetBackgroundColor() const override;
   void SetContentSizeConstraints(
       const extensions::SizeConstraints& size_constraints) override;
 #if BUILDFLAG(IS_WIN)
@@ -78,45 +78,45 @@ class NativeWindowViews : public NativeWindow,
   void SetResizable(bool resizable) override;
   bool MoveAbove(const std::string& sourceId) override;
   void MoveTop() override;
-  bool IsResizable() override;
+  bool IsResizable() const override;
   void SetAspectRatio(double aspect_ratio,
                       const gfx::Size& extra_size) override;
   void SetMovable(bool movable) override;
-  bool IsMovable() override;
+  bool IsMovable() const override;
   void SetMinimizable(bool minimizable) override;
-  bool IsMinimizable() override;
+  bool IsMinimizable() const override;
   void SetMaximizable(bool maximizable) override;
-  bool IsMaximizable() override;
+  bool IsMaximizable() const override;
   void SetFullScreenable(bool fullscreenable) override;
-  bool IsFullScreenable() override;
+  bool IsFullScreenable() const override;
   void SetClosable(bool closable) override;
-  bool IsClosable() override;
+  bool IsClosable() const override;
   void SetAlwaysOnTop(ui::ZOrderLevel z_order,
                       const std::string& level,
                       int relativeLevel) override;
-  ui::ZOrderLevel GetZOrderLevel() override;
+  ui::ZOrderLevel GetZOrderLevel() const override;
   void Center() override;
   void Invalidate() override;
   void SetTitle(const std::string& title) override;
-  std::string GetTitle() override;
+  std::string GetTitle() const override;
   void FlashFrame(bool flash) override;
   void SetSkipTaskbar(bool skip) override;
   void SetExcludedFromShownWindowsMenu(bool excluded) override;
-  bool IsExcludedFromShownWindowsMenu() override;
+  bool IsExcludedFromShownWindowsMenu() const override;
   void SetSimpleFullScreen(bool simple_fullscreen) override;
-  bool IsSimpleFullScreen() override;
+  bool IsSimpleFullScreen() const override;
   void SetKiosk(bool kiosk) override;
-  bool IsKiosk() override;
+  bool IsKiosk() const override;
   bool IsTabletMode() const override;
   void SetBackgroundColor(SkColor color) override;
   void SetHasShadow(bool has_shadow) override;
-  bool HasShadow() override;
+  bool HasShadow() const override;
   void SetOpacity(const double opacity) override;
-  double GetOpacity() override;
+  double GetOpacity() const override;
   void SetIgnoreMouseEvents(bool ignore, bool forward) override;
   void SetContentProtection(bool enable) override;
   void SetFocusable(bool focusable) override;
-  bool IsFocusable() override;
+  bool IsFocusable() const override;
   void SetMenu(ElectronMenuModel* menu_model) override;
   void AddBrowserView(NativeBrowserView* browser_view) override;
   void RemoveBrowserView(NativeBrowserView* browser_view) override;
@@ -128,16 +128,16 @@ class NativeWindowViews : public NativeWindow,
                       const std::string& description) override;
   void SetProgressBar(double progress, const ProgressState state) override;
   void SetAutoHideMenuBar(bool auto_hide) override;
-  bool IsMenuBarAutoHide() override;
+  bool IsMenuBarAutoHide() const override;
   void SetMenuBarVisibility(bool visible) override;
-  bool IsMenuBarVisible() override;
+  bool IsMenuBarVisible() const override;
   void SetBackgroundMaterial(const std::string& type) override;
 
   void SetVisibleOnAllWorkspaces(bool visible,
                                  bool visibleOnFullScreen,
                                  bool skipTransformProcessType) override;
 
-  bool IsVisibleOnAllWorkspaces() override;
+  bool IsVisibleOnAllWorkspaces() const override;
 
   void SetGTKDarkThemeEnabled(bool use_dark_theme) override;
 
@@ -229,7 +229,7 @@ class NativeWindowViews : public NativeWindow,
 #endif
 
   // Enable/disable:
-  bool ShouldBeEnabled();
+  bool ShouldBeEnabled() const;
   void SetEnabledInternal(bool enabled);
 
   // NativeWindow: