Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 10544185: Order the script badges in the location bar consistently (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 // View responsible for showing suggested text. This is NULL when there is no 443 // View responsible for showing suggested text. This is NULL when there is no
444 // suggested text. 444 // suggested text.
445 SuggestedTextView* suggested_text_view_; 445 SuggestedTextView* suggested_text_view_;
446 446
447 // Shown if the selected url has a corresponding keyword. 447 // Shown if the selected url has a corresponding keyword.
448 KeywordHintView* keyword_hint_view_; 448 KeywordHintView* keyword_hint_view_;
449 449
450 // The content setting views. 450 // The content setting views.
451 ContentSettingViews content_setting_views_; 451 ContentSettingViews content_setting_views_;
452 452
453 // The current page actions.
454 std::vector<ExtensionAction*> page_actions_;
455
453 // The page action icon views. 456 // The page action icon views.
454 PageActionViews page_action_views_; 457 PageActionViews page_action_views_;
455 458
456 // The star. 459 // The star.
457 StarView* star_view_; 460 StarView* star_view_;
458 461
459 // The action box button (plus). 462 // The action box button (plus).
460 ActionBoxButtonView* action_box_button_view_; 463 ActionBoxButtonView* action_box_button_view_;
461 464
462 // The Chrome To Mobile page action icon view. 465 // The Chrome To Mobile page action icon view.
(...skipping 19 matching lines...) Expand all
482 // in the right location. 485 // in the right location.
483 int animation_offset_; 486 int animation_offset_;
484 487
485 // Used to register for notifications received by NotificationObserver. 488 // Used to register for notifications received by NotificationObserver.
486 content::NotificationRegistrar registrar_; 489 content::NotificationRegistrar registrar_;
487 490
488 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 491 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
489 }; 492 };
490 493
491 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 494 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698