| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_VIEWS_BOOKMARK_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ | 
| 6 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ | 
| 7 | 7 | 
| 8 #include <set> | 8 #include <set> | 
| 9 | 9 | 
| 10 #include "app/slide_animation.h" | 10 #include "app/slide_animation.h" | 
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 422 | 422 | 
| 423   // This method computes the bounds for the bookmark bar items. If | 423   // This method computes the bounds for the bookmark bar items. If | 
| 424   // |compute_bounds_only| = TRUE, the bounds for the items are just computed, | 424   // |compute_bounds_only| = TRUE, the bounds for the items are just computed, | 
| 425   // but are not set. This mode is used by GetPreferredSize() to obtain the | 425   // but are not set. This mode is used by GetPreferredSize() to obtain the | 
| 426   // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set. | 426   // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set. | 
| 427   gfx::Size LayoutItems(bool compute_bounds_only); | 427   gfx::Size LayoutItems(bool compute_bounds_only); | 
| 428 | 428 | 
| 429   // Creates the sync error button and adds it as a child view. | 429   // Creates the sync error button and adds it as a child view. | 
| 430   views::TextButton* CreateSyncErrorButton(); | 430   views::TextButton* CreateSyncErrorButton(); | 
| 431 | 431 | 
| 432   // Asserts the number of bookmark buttons we have matches that of the model, |  | 
| 433   // as well as this being invoked on the ui thread. |  | 
| 434   void CheckIntegrity(); |  | 
| 435 |  | 
| 436   NotificationRegistrar registrar_; | 432   NotificationRegistrar registrar_; | 
| 437 | 433 | 
| 438   Profile* profile_; | 434   Profile* profile_; | 
| 439 | 435 | 
| 440   // Used for opening urls. | 436   // Used for opening urls. | 
| 441   PageNavigator* page_navigator_; | 437   PageNavigator* page_navigator_; | 
| 442 | 438 | 
| 443   // Model providing details as to the starred entries/groups that should be | 439   // Model providing details as to the starred entries/groups that should be | 
| 444   // shown. This is owned by the Profile. | 440   // shown. This is owned by the Profile. | 
| 445   BookmarkModel* model_; | 441   BookmarkModel* model_; | 
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 492   // overflow_button_ or a button on the bar. | 488   // overflow_button_ or a button on the bar. | 
| 493   views::CustomButton* throbbing_view_; | 489   views::CustomButton* throbbing_view_; | 
| 494 | 490 | 
| 495   // Background for extension toolstrips. | 491   // Background for extension toolstrips. | 
| 496   SkBitmap toolstrip_background_; | 492   SkBitmap toolstrip_background_; | 
| 497 | 493 | 
| 498   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); | 494   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView); | 
| 499 }; | 495 }; | 
| 500 | 496 | 
| 501 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ | 497 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_ | 
| OLD | NEW | 
|---|