Chromium Code Reviews| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 308 | 308 |
| 309 // Overridden from content::NotificationObserver | 309 // Overridden from content::NotificationObserver |
| 310 virtual void Observe(int type, | 310 virtual void Observe(int type, |
| 311 const content::NotificationSource& source, | 311 const content::NotificationSource& source, |
| 312 const content::NotificationDetails& details) OVERRIDE; | 312 const content::NotificationDetails& details) OVERRIDE; |
| 313 | 313 |
| 314 // Thickness of the left and right edges of the omnibox, in normal mode. | 314 // Thickness of the left and right edges of the omnibox, in normal mode. |
| 315 static const int kNormalHorizontalEdgeThickness; | 315 static const int kNormalHorizontalEdgeThickness; |
| 316 // Thickness of the top and bottom edges of the omnibox. | 316 // Thickness of the top and bottom edges of the omnibox. |
| 317 static const int kVerticalEdgeThickness; | 317 static const int kVerticalEdgeThickness; |
| 318 // Space between items in the location bar. | |
| 319 static const int kItemPadding; | |
| 320 // Amount of padding built into the standard omnibox icons. | 318 // Amount of padding built into the standard omnibox icons. |
| 321 static const int kIconInternalPadding; | 319 static const int kIconInternalPadding; |
| 322 // Space between the edges and the items next to them. | |
| 323 static const int kEdgeItemPadding; | |
| 324 // Space between the edge and a bubble. | 320 // Space between the edge and a bubble. |
| 325 static const int kBubbleHorizontalPadding; | 321 static const int kBubbleHorizontalPadding; |
| 326 | 322 |
| 323 // Space between items in the location bar. | |
|
Peter Kasting
2012/05/11 23:01:41
Nit: Methods above variables
Jói
2012/05/14 18:29:45
Done.
| |
| 324 static int GetItemPadding(); | |
| 325 | |
| 326 // Space between the edges and the items next to them. | |
| 327 static int GetEdgeItemPadding(); | |
| 328 | |
| 327 protected: | 329 protected: |
| 328 virtual void OnFocus() OVERRIDE; | 330 virtual void OnFocus() OVERRIDE; |
| 329 | 331 |
| 330 private: | 332 private: |
| 331 typedef std::vector<ContentSettingImageView*> ContentSettingViews; | 333 typedef std::vector<ContentSettingImageView*> ContentSettingViews; |
| 332 | 334 |
| 333 friend class PageActionImageView; | 335 friend class PageActionImageView; |
| 334 friend class PageActionWithBadgeView; | 336 friend class PageActionWithBadgeView; |
| 335 typedef std::vector<PageActionWithBadgeView*> PageActionViews; | 337 typedef std::vector<PageActionWithBadgeView*> PageActionViews; |
| 336 | 338 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 470 // While animating, the host clips the widget and draws only the bottom | 472 // While animating, the host clips the widget and draws only the bottom |
| 471 // part of it. The view needs to know the pixel offset at which we are drawing | 473 // part of it. The view needs to know the pixel offset at which we are drawing |
| 472 // the widget so that we can draw the curved edges that attach to the toolbar | 474 // the widget so that we can draw the curved edges that attach to the toolbar |
| 473 // in the right location. | 475 // in the right location. |
| 474 int animation_offset_; | 476 int animation_offset_; |
| 475 | 477 |
| 476 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 478 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 477 }; | 479 }; |
| 478 | 480 |
| 479 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 481 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |