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 <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser | 391 // chromeos::SimpleWebViewDialog uses a LocationBarView outside any browser |
392 // window, so this may be NULL. | 392 // window, so this may be NULL. |
393 Browser* browser_; | 393 Browser* browser_; |
394 | 394 |
395 OmniboxViewViews* omnibox_view_; | 395 OmniboxViewViews* omnibox_view_; |
396 | 396 |
397 // Our delegate. | 397 // Our delegate. |
398 Delegate* delegate_; | 398 Delegate* delegate_; |
399 | 399 |
400 // Object used to paint the border. Not used for material design. | 400 // Object used to paint the border. Not used for material design. |
401 scoped_ptr<views::Painter> border_painter_; | 401 std::unique_ptr<views::Painter> border_painter_; |
402 | 402 |
403 // An icon to the left of the edit field: the HTTPS lock, blank page icon, | 403 // An icon to the left of the edit field: the HTTPS lock, blank page icon, |
404 // search icon, EV HTTPS bubble, etc. | 404 // search icon, EV HTTPS bubble, etc. |
405 LocationIconView* location_icon_view_; | 405 LocationIconView* location_icon_view_; |
406 | 406 |
407 // A view to show inline autocompletion when an IME is active. In this case, | 407 // A view to show inline autocompletion when an IME is active. In this case, |
408 // we shouldn't change the text or selection inside the OmniboxView itself, | 408 // we shouldn't change the text or selection inside the OmniboxView itself, |
409 // since this will conflict with the IME's control over the text. So instead | 409 // since this will conflict with the IME's control over the text. So instead |
410 // we show any autocompletion in a separate field after the OmniboxView. | 410 // we show any autocompletion in a separate field after the OmniboxView. |
411 views::Label* ime_inline_autocomplete_view_; | 411 views::Label* ime_inline_autocomplete_view_; |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 BooleanPrefMember edit_bookmarks_enabled_; | 469 BooleanPrefMember edit_bookmarks_enabled_; |
470 | 470 |
471 // This is a debug state variable that stores if the WebContents was null | 471 // This is a debug state variable that stores if the WebContents was null |
472 // during the last RefreshPageAction. | 472 // during the last RefreshPageAction. |
473 bool web_contents_null_at_last_refresh_; | 473 bool web_contents_null_at_last_refresh_; |
474 | 474 |
475 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 475 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
476 }; | 476 }; |
477 | 477 |
478 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 478 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
OLD | NEW |