| Index: chrome/browser/chromeos/compact_location_bar_view.h
|
| ===================================================================
|
| --- chrome/browser/chromeos/compact_location_bar_view.h (revision 38044)
|
| +++ chrome/browser/chromeos/compact_location_bar_view.h (working copy)
|
| @@ -20,6 +20,7 @@
|
| class Tab;
|
| class TabContents;
|
| class TabStrip;
|
| +class ToolbarStarToggle;
|
|
|
| namespace views {
|
| class ImageButton;
|
| @@ -34,7 +35,8 @@
|
| class CompactLocationBarView : public DropdownBarView,
|
| public views::ButtonListener,
|
| public AutocompleteEditController,
|
| - public BubblePositioner {
|
| + public BubblePositioner,
|
| + public views::DragController {
|
| public:
|
| explicit CompactLocationBarView(CompactLocationBarHost* host);
|
| ~CompactLocationBarView();
|
| @@ -44,6 +46,8 @@
|
|
|
| void Update(const TabContents* contents);
|
|
|
| + ToolbarStarToggle* star_button() const { return star_; }
|
| +
|
| private:
|
| Browser* browser() const;
|
|
|
| @@ -77,6 +81,20 @@
|
| // BubblePositioner implementation.
|
| virtual gfx::Rect GetLocationStackBounds() const;
|
|
|
| + // views::DragController implementation.
|
| + virtual void WriteDragData(View* sender,
|
| + int press_x,
|
| + int press_y,
|
| + OSExchangeData* data);
|
| + virtual int GetDragOperations(View* sender, int x, int y);
|
| + virtual bool CanStartDrag(View* sender,
|
| + int press_x,
|
| + int press_y,
|
| + int x,
|
| + int y) {
|
| + return true;
|
| + }
|
| +
|
| CompactLocationBarHost* clb_host() {
|
| return static_cast<CompactLocationBarHost*>(host());
|
| }
|
| @@ -85,8 +103,7 @@
|
| scoped_ptr<AutocompleteEditViewGtk> location_entry_;
|
| views::NativeViewHost* location_entry_view_;
|
|
|
| - // scoped_ptr<ToolbarStarToggleGtk> star_;
|
| - views::NativeViewHost* star_view_;
|
| + ToolbarStarToggle* star_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CompactLocationBarView);
|
| };
|
|
|