| 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 ui::MenuSourceType source_type) OVERRIDE; | 253 ui::MenuSourceType source_type) OVERRIDE; |
| 254 | 254 |
| 255 private: | 255 private: |
| 256 class ButtonSeparatorView; | 256 class ButtonSeparatorView; |
| 257 struct DropInfo; | 257 struct DropInfo; |
| 258 struct DropLocation; | 258 struct DropLocation; |
| 259 | 259 |
| 260 friend class BookmarkBarViewEventTestBase; | 260 friend class BookmarkBarViewEventTestBase; |
| 261 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile); | 261 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, SwitchProfile); |
| 262 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, | 262 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewTest, |
| 263 NoAppsShortcutWithoutInstantExtended); | 263 ManagedShowAppsShortcutInBookmarksBar); |
| 264 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewInstantExtendedTest, | 264 FRIEND_TEST_ALL_PREFIXES(BookmarkBarViewInstantExtendedTest, |
| 265 AppsShortcutVisibility); | 265 AppsShortcutVisibility); |
| 266 | 266 |
| 267 // Used to identify what the user is dropping onto. | 267 // Used to identify what the user is dropping onto. |
| 268 enum DropButtonType { | 268 enum DropButtonType { |
| 269 DROP_BOOKMARK, | 269 DROP_BOOKMARK, |
| 270 DROP_OTHER_FOLDER, | 270 DROP_OTHER_FOLDER, |
| 271 DROP_OVERFLOW | 271 DROP_OVERFLOW |
| 272 }; | 272 }; |
| 273 | 273 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 | 435 |
| 436 BookmarkBar::State bookmark_bar_state_; | 436 BookmarkBar::State bookmark_bar_state_; |
| 437 | 437 |
| 438 // Are we animating to or from the detached state? | 438 // Are we animating to or from the detached state? |
| 439 bool animating_detached_; | 439 bool animating_detached_; |
| 440 | 440 |
| 441 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); | 441 DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); |
| 442 }; | 442 }; |
| 443 | 443 |
| 444 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ | 444 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ |
| OLD | NEW |