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

Unified Diff: chrome/browser/ui/panels/panel_cocoa.h

Issue 10908153: [Panel refactor] Deprecate old panels. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux_chromeos test failure Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/panels/panel_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_cocoa.h
diff --git a/chrome/browser/ui/panels/panel_cocoa.h b/chrome/browser/ui/panels/panel_cocoa.h
index 8d05b26acd3fb16be8322fb6510ae8fc5a2cad6a..4ca310d66d42eb0ed2994c11a7c6668dc1f132a9 100644
--- a/chrome/browser/ui/panels/panel_cocoa.h
+++ b/chrome/browser/ui/panels/panel_cocoa.h
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/panels/native_panel_cocoa.h"
+#include "chrome/browser/ui/panels/native_panel.h"
#include "ui/gfx/rect.h"
class Panel;
@@ -16,9 +16,7 @@ class Panel;
// An implememtation of the native panel in Cocoa.
// Bridges between C++ and the Cocoa NSWindow. Cross-platform code will
// interact with this object when it needs to manipulate the window.
-// TODO(jennb): This class can be removed after the panel refactor once
-// it's safe for PanelWindowController to use PanelCocoa directly.
-class PanelCocoa : public NativePanelCocoa {
+class PanelCocoa : public NativePanel {
public:
PanelCocoa(Panel* panel, const gfx::Rect& bounds);
virtual ~PanelCocoa();
@@ -37,21 +35,15 @@ class PanelCocoa : public NativePanelCocoa {
virtual gfx::NativeWindow GetNativePanelHandle() OVERRIDE;
virtual void UpdatePanelTitleBar() OVERRIDE;
virtual void UpdatePanelLoadingAnimations(bool should_animate) OVERRIDE;
- virtual FindBar* CreatePanelFindBar() OVERRIDE;
virtual void NotifyPanelOnUserChangedTheme() OVERRIDE;
virtual void PanelCut() OVERRIDE;
virtual void PanelCopy() OVERRIDE;
virtual void PanelPaste() OVERRIDE;
virtual void DrawAttention(bool draw_attention) OVERRIDE;
virtual bool IsDrawingAttention() const OVERRIDE;
- virtual bool PreHandlePanelKeyboardEvent(
- const content::NativeWebKeyboardEvent& event,
- bool* is_keyboard_shortcut) OVERRIDE;
virtual void HandlePanelKeyboardEvent(
const content::NativeWebKeyboardEvent& event) OVERRIDE;
virtual void FullScreenModeChanged(bool is_full_screen) OVERRIDE;
- virtual Browser* GetPanelBrowser() const OVERRIDE;
- virtual void EnsurePanelFullyVisible() OVERRIDE;
virtual void SetPanelAlwaysOnTop(bool on_top) OVERRIDE;
virtual void EnableResizeByMouse(bool enable) OVERRIDE;
virtual void UpdatePanelMinimizeRestoreButtonVisibility() OVERRIDE;
@@ -70,9 +62,8 @@ class PanelCocoa : public NativePanelCocoa {
virtual NativePanelTesting* CreateNativePanelTesting() OVERRIDE;
- // Overridden from NativePanelCocoa.
- virtual Panel* panel() const OVERRIDE;
- virtual void DidCloseNativeWindow() OVERRIDE;
+ Panel* panel() const;
+ void DidCloseNativeWindow();
private:
friend class CocoaNativePanelTesting;
« no previous file with comments | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/panels/panel_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698