| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 // views::MenuButtonListener: | 239 // views::MenuButtonListener: |
| 240 virtual void OnMenuButtonClicked(views::View* view, | 240 virtual void OnMenuButtonClicked(views::View* view, |
| 241 const gfx::Point& point) OVERRIDE; | 241 const gfx::Point& point) OVERRIDE; |
| 242 | 242 |
| 243 // views::ButtonListener: | 243 // views::ButtonListener: |
| 244 virtual void ButtonPressed(views::Button* sender, | 244 virtual void ButtonPressed(views::Button* sender, |
| 245 const ui::Event& event) OVERRIDE; | 245 const ui::Event& event) OVERRIDE; |
| 246 | 246 |
| 247 // views::ContextMenuController: | 247 // views::ContextMenuController: |
| 248 virtual void ShowContextMenuForView(views::View* source, | 248 virtual void ShowContextMenuForView( |
| 249 const gfx::Point& point) OVERRIDE; | 249 views::View* source, |
| 250 const gfx::Point& point, |
| 251 ui::ContextMenuSourceType source_type) OVERRIDE; |
| 250 | 252 |
| 251 private: | 253 private: |
| 252 class ButtonSeparatorView; | 254 class ButtonSeparatorView; |
| 253 struct DropInfo; | 255 struct DropInfo; |
| 254 struct DropLocation; | 256 struct DropLocation; |
| 255 | 257 |
| 256 friend class BookmarkBarViewEventTestBase; | 258 friend class BookmarkBarViewEventTestBase; |
| 257 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile); | 259 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile); |
| 258 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, | 260 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, |
| 259 NoAppsShortcutWithoutInstantExtended); | 261 NoAppsShortcutWithoutInstantExtended); |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 | 435 |
| 434 BookmarkBar::State bookmark_bar_state_; | 436 BookmarkBar::State bookmark_bar_state_; |
| 435 | 437 |
| 436 // Are we animating to or from the detached state? | 438 // Are we animating to or from the detached state? |
| 437 bool animating_detached_; | 439 bool animating_detached_; |
| 438 | 440 |
| 439 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); | 441 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); |
| 440 }; | 442 }; |
| 441 | 443 |
| 442 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 444 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| OLD | NEW |