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 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 395 // The Browser this LocationBarView is in. Note that at least | 395 // The Browser this LocationBarView is in. Note that at least |
| 396 // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser | 396 // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser |
| 397 // window, so this may be NULL. | 397 // window, so this may be NULL. |
| 398 Browser* browser_; | 398 Browser* browser_; |
| 399 | 399 |
| 400 OmniboxViewViews* omnibox_view_; | 400 OmniboxViewViews* omnibox_view_; |
| 401 | 401 |
| 402 // Our delegate. | 402 // Our delegate. |
| 403 Delegate* delegate_; | 403 Delegate* delegate_; |
| 404 | 404 |
| 405 // Object used to paint the border. | 405 // Object used to paint the border when not being used in Material Design. |
|
tdanderson
2015/09/28 15:52:12
nit: how about something like "Object used to pain
jonross
2015/09/28 17:42:30
Done.
| |
| 406 scoped_ptr<views::Painter> border_painter_; | 406 scoped_ptr<views::Painter> border_painter_; |
| 407 | 407 |
| 408 // An icon to the left of the edit field. | 408 // An icon to the left of the edit field. |
| 409 LocationIconView* location_icon_view_; | 409 LocationIconView* location_icon_view_; |
| 410 | 410 |
| 411 // A bubble displayed for EV HTTPS sites. | 411 // A bubble displayed for EV HTTPS sites. |
| 412 EVBubbleView* ev_bubble_view_; | 412 EVBubbleView* ev_bubble_view_; |
| 413 | 413 |
| 414 // A view to show inline autocompletion when an IME is active. In this case, | 414 // A view to show inline autocompletion when an IME is active. In this case, |
| 415 // we shouldn't change the text or selection inside the OmniboxView itself, | 415 // we shouldn't change the text or selection inside the OmniboxView itself, |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 482 int dropdown_animation_offset_; | 482 int dropdown_animation_offset_; |
| 483 | 483 |
| 484 // This is a debug state variable that stores if the WebContents was null | 484 // This is a debug state variable that stores if the WebContents was null |
| 485 // during the last RefreshPageAction. | 485 // during the last RefreshPageAction. |
| 486 bool web_contents_null_at_last_refresh_; | 486 bool web_contents_null_at_last_refresh_; |
| 487 | 487 |
| 488 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 488 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
| 489 }; | 489 }; |
| 490 | 490 |
| 491 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 491 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |