| Index: chrome/browser/chromeos/frame/panel_controller.h
|
| diff --git a/chrome/browser/chromeos/frame/panel_controller.h b/chrome/browser/chromeos/frame/panel_controller.h
|
| index ec27bf2fcd09232b6318285b2905b26e047bb712..ef0bcc7b90fcf303b46e8fd15ea81509c3dd06ed 100644
|
| --- a/chrome/browser/chromeos/frame/panel_controller.h
|
| +++ b/chrome/browser/chromeos/frame/panel_controller.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -62,8 +62,9 @@ class PanelController {
|
| WmIpcPanelUserResizeType resize_type);
|
|
|
| bool TitleMousePressed(const views::MouseEvent& event);
|
| - void TitleMouseReleased(const views::MouseEvent& event, bool canceled);
|
| bool TitleMouseDragged(const views::MouseEvent& event);
|
| + void TitleMouseReleased(const views::MouseEvent& event);
|
| + void TitleMouseCaptureLost();
|
| bool PanelClientEvent(GdkEventClient* event);
|
| void OnFocusIn();
|
| void OnFocusOut();
|
| @@ -79,10 +80,6 @@ class PanelController {
|
| public:
|
| explicit TitleContentView(PanelController* panelController);
|
| virtual ~TitleContentView();
|
| - virtual void Layout();
|
| - virtual bool OnMousePressed(const views::MouseEvent& event);
|
| - virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
|
| - virtual bool OnMouseDragged(const views::MouseEvent& event);
|
| void OnFocusIn();
|
| void OnFocusOut();
|
| void OnClose();
|
| @@ -91,9 +88,16 @@ class PanelController {
|
| views::Label* title_label() { return title_label_; }
|
| views::ImageButton* close_button() { return close_button_; }
|
|
|
| + // Overridden from View:
|
| + virtual void Layout() OVERRIDE;
|
| + virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseCaptureLost() OVERRIDE;
|
| +
|
| // ButtonListener methods.
|
| virtual void ButtonPressed(views::Button* sender,
|
| - const views::Event& event);
|
| + const views::Event& event) OVERRIDE;
|
| private:
|
| views::ImageView* title_icon_;
|
| views::Label* title_label_;
|
|
|