Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Side by Side Diff: chrome/browser/ui/cocoa/panels/panel_cocoa.mm

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/panels/panel_cocoa.h" 5 #include "chrome/browser/ui/cocoa/panels/panel_cocoa.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" 8 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
9 #import "chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h" 9 #import "chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h"
10 #import "chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h" 10 #import "chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h"
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 panel_->OnNativePanelClosed(); 320 panel_->OnNativePanelClosed();
321 } 321 }
322 322
323 // NativePanelTesting implementation. 323 // NativePanelTesting implementation.
324 class CocoaNativePanelTesting : public NativePanelTesting { 324 class CocoaNativePanelTesting : public NativePanelTesting {
325 public: 325 public:
326 CocoaNativePanelTesting(NativePanel* native_panel); 326 CocoaNativePanelTesting(NativePanel* native_panel);
327 virtual ~CocoaNativePanelTesting() { } 327 virtual ~CocoaNativePanelTesting() { }
328 // Overridden from NativePanelTesting 328 // Overridden from NativePanelTesting
329 virtual void PressLeftMouseButtonTitlebar( 329 virtual void PressLeftMouseButtonTitlebar(
330 const gfx::Point& mouse_location, panel::ClickModifier modifier) OVERRIDE; 330 const gfx::Point& mouse_location, panel::ClickModifier modifier) override;
331 virtual void ReleaseMouseButtonTitlebar( 331 virtual void ReleaseMouseButtonTitlebar(
332 panel::ClickModifier modifier) OVERRIDE; 332 panel::ClickModifier modifier) override;
333 virtual void DragTitlebar(const gfx::Point& mouse_location) OVERRIDE; 333 virtual void DragTitlebar(const gfx::Point& mouse_location) override;
334 virtual void CancelDragTitlebar() OVERRIDE; 334 virtual void CancelDragTitlebar() override;
335 virtual void FinishDragTitlebar() OVERRIDE; 335 virtual void FinishDragTitlebar() override;
336 virtual bool VerifyDrawingAttention() const OVERRIDE; 336 virtual bool VerifyDrawingAttention() const override;
337 virtual bool VerifyActiveState(bool is_active) OVERRIDE; 337 virtual bool VerifyActiveState(bool is_active) override;
338 virtual bool VerifyAppIcon() const OVERRIDE; 338 virtual bool VerifyAppIcon() const override;
339 virtual bool VerifySystemMinimizeState() const OVERRIDE; 339 virtual bool VerifySystemMinimizeState() const override;
340 virtual bool IsWindowVisible() const OVERRIDE; 340 virtual bool IsWindowVisible() const override;
341 virtual bool IsWindowSizeKnown() const OVERRIDE; 341 virtual bool IsWindowSizeKnown() const override;
342 virtual bool IsAnimatingBounds() const OVERRIDE; 342 virtual bool IsAnimatingBounds() const override;
343 virtual bool IsButtonVisible( 343 virtual bool IsButtonVisible(
344 panel::TitlebarButtonType button_type) const OVERRIDE; 344 panel::TitlebarButtonType button_type) const override;
345 virtual panel::CornerStyle GetWindowCornerStyle() const OVERRIDE; 345 virtual panel::CornerStyle GetWindowCornerStyle() const override;
346 virtual bool EnsureApplicationRunOnForeground() OVERRIDE; 346 virtual bool EnsureApplicationRunOnForeground() override;
347 347
348 private: 348 private:
349 PanelTitlebarViewCocoa* titlebar() const; 349 PanelTitlebarViewCocoa* titlebar() const;
350 // Weak, assumed always to outlive this test API object. 350 // Weak, assumed always to outlive this test API object.
351 PanelCocoa* native_panel_window_; 351 PanelCocoa* native_panel_window_;
352 }; 352 };
353 353
354 NativePanelTesting* PanelCocoa::CreateNativePanelTesting() { 354 NativePanelTesting* PanelCocoa::CreateNativePanelTesting() {
355 return new CocoaNativePanelTesting(this); 355 return new CocoaNativePanelTesting(this);
356 } 356 }
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 panel::CornerStyle CocoaNativePanelTesting::GetWindowCornerStyle() const { 452 panel::CornerStyle CocoaNativePanelTesting::GetWindowCornerStyle() const {
453 return native_panel_window_->corner_style_; 453 return native_panel_window_->corner_style_;
454 } 454 }
455 455
456 bool CocoaNativePanelTesting::EnsureApplicationRunOnForeground() { 456 bool CocoaNativePanelTesting::EnsureApplicationRunOnForeground() {
457 if ([NSApp isActive]) 457 if ([NSApp isActive])
458 return true; 458 return true;
459 [NSApp activateIgnoringOtherApps:YES]; 459 [NSApp activateIgnoringOtherApps:YES];
460 return [NSApp isActive]; 460 return [NSApp isActive];
461 } 461 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/panels/panel_cocoa.h ('k') | chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698