| 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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 | 276 |
| 277 friend class PageActionImageView; | 277 friend class PageActionImageView; |
| 278 friend class PageActionWithBadgeView; | 278 friend class PageActionWithBadgeView; |
| 279 typedef std::vector<ExtensionAction*> PageActions; | 279 typedef std::vector<ExtensionAction*> PageActions; |
| 280 typedef std::vector<PageActionWithBadgeView*> PageActionViews; | 280 typedef std::vector<PageActionWithBadgeView*> PageActionViews; |
| 281 | 281 |
| 282 // Helper for GetMinimumWidth(). Calculates the incremental minimum width | 282 // Helper for GetMinimumWidth(). Calculates the incremental minimum width |
| 283 // |view| should add to the trailing width after the omnibox. | 283 // |view| should add to the trailing width after the omnibox. |
| 284 static int IncrementalMinimumWidth(views::View* view); | 284 static int IncrementalMinimumWidth(views::View* view); |
| 285 | 285 |
| 286 // Initializes the |border_painter_|. |
| 287 void CreateBorderPainter(); |
| 288 |
| 286 // Returns the thickness of any visible left and right edge, in pixels. | 289 // Returns the thickness of any visible left and right edge, in pixels. |
| 287 int GetHorizontalEdgeThickness() const; | 290 int GetHorizontalEdgeThickness() const; |
| 288 | 291 |
| 289 // The same, but for the top and bottom edges. | 292 // The same, but for the top and bottom edges. |
| 290 int vertical_edge_thickness() const { | 293 int vertical_edge_thickness() const { |
| 291 return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness; | 294 return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness; |
| 292 } | 295 } |
| 293 | 296 |
| 294 // Updates the visibility state of the Content Blocked icons to reflect what | 297 // Updates the visibility state of the Content Blocked icons to reflect what |
| 295 // is actually blocked on the current page. Returns true if the visibility | 298 // is actually blocked on the current page. Returns true if the visibility |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 int dropdown_animation_offset_; | 502 int dropdown_animation_offset_; |
| 500 | 503 |
| 501 // This is a debug state variable that stores if the WebContents was null | 504 // This is a debug state variable that stores if the WebContents was null |
| 502 // during the last RefreshPageAction. | 505 // during the last RefreshPageAction. |
| 503 bool web_contents_null_at_last_refresh_; | 506 bool web_contents_null_at_last_refresh_; |
| 504 | 507 |
| 505 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 508 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
| 506 }; | 509 }; |
| 507 | 510 |
| 508 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 511 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |