| 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_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 | 268 |
| 269 friend class PageActionImageView; | 269 friend class PageActionImageView; |
| 270 friend class PageActionWithBadgeView; | 270 friend class PageActionWithBadgeView; |
| 271 typedef std::vector<ExtensionAction*> PageActions; | 271 typedef std::vector<ExtensionAction*> PageActions; |
| 272 typedef std::vector<PageActionWithBadgeView*> PageActionViews; | 272 typedef std::vector<PageActionWithBadgeView*> PageActionViews; |
| 273 | 273 |
| 274 // Helper for GetMinimumWidth(). Calculates the incremental minimum width | 274 // Helper for GetMinimumWidth(). Calculates the incremental minimum width |
| 275 // |view| should add to the trailing width after the omnibox. | 275 // |view| should add to the trailing width after the omnibox. |
| 276 int IncrementalMinimumWidth(views::View* view) const; | 276 int IncrementalMinimumWidth(views::View* view) const; |
| 277 | 277 |
| 278 // Returns the thickness of any visible left and right edge, in pixels. | 278 // Returns the thickness of any visible edge, in pixels. |
| 279 int GetHorizontalEdgeThickness() const; | 279 int GetEdgeThickness() const; |
| 280 | |
| 281 // The same, but for the top and bottom edges. | |
| 282 int GetVerticalEdgeThickness() const; | |
| 283 | 280 |
| 284 // The vertical padding to be applied to all contained views. | 281 // The vertical padding to be applied to all contained views. |
| 285 int VerticalPadding() const; | 282 int VerticalPadding() const; |
| 286 | 283 |
| 287 // Updates |location_icon_view_| based on the current state and theme. | 284 // Updates |location_icon_view_| based on the current state and theme. |
| 288 void RefreshLocationIcon(); | 285 void RefreshLocationIcon(); |
| 289 | 286 |
| 290 // Updates the visibility state of the Content Blocked icons to reflect what | 287 // Updates the visibility state of the Content Blocked icons to reflect what |
| 291 // is actually blocked on the current page. Returns true if the visibility | 288 // is actually blocked on the current page. Returns true if the visibility |
| 292 // of at least one of the views in |content_setting_views_| changed. | 289 // of at least one of the views in |content_setting_views_| changed. |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 int dropdown_animation_offset_; | 484 int dropdown_animation_offset_; |
| 488 | 485 |
| 489 // This is a debug state variable that stores if the WebContents was null | 486 // This is a debug state variable that stores if the WebContents was null |
| 490 // during the last RefreshPageAction. | 487 // during the last RefreshPageAction. |
| 491 bool web_contents_null_at_last_refresh_; | 488 bool web_contents_null_at_last_refresh_; |
| 492 | 489 |
| 493 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 490 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
| 494 }; | 491 }; |
| 495 | 492 |
| 496 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 493 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |