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

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: revert scoped_ptr change, rebase 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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 // View responsible for showing suggested text. This is NULL when there is no 431 // View responsible for showing suggested text. This is NULL when there is no
432 // suggested text. 432 // suggested text.
433 SuggestedTextView* suggested_text_view_; 433 SuggestedTextView* suggested_text_view_;
434 434
435 // Shown if the selected url has a corresponding keyword. 435 // Shown if the selected url has a corresponding keyword.
436 KeywordHintView* keyword_hint_view_; 436 KeywordHintView* keyword_hint_view_;
437 437
438 // The content setting views. 438 // The content setting views.
439 ContentSettingViews content_setting_views_; 439 ContentSettingViews content_setting_views_;
440 440
441 // The current page actions.
442 std::vector<ExtensionAction*> page_actions_;
443
441 // The page action icon views. 444 // The page action icon views.
442 PageActionViews page_action_views_; 445 PageActionViews page_action_views_;
443 446
444 // The star. 447 // The star.
445 StarView* star_view_; 448 StarView* star_view_;
446 449
447 // The action box button (plus). 450 // The action box button (plus).
448 ActionBoxButtonView* action_box_button_view_; 451 ActionBoxButtonView* action_box_button_view_;
449 452
450 // The Chrome To Mobile page action icon view. 453 // The Chrome To Mobile page action icon view.
(...skipping 19 matching lines...) Expand all
470 // in the right location. 473 // in the right location.
471 int animation_offset_; 474 int animation_offset_;
472 475
473 // Used to register for notifications received by NotificationObserver. 476 // Used to register for notifications received by NotificationObserver.
474 content::NotificationRegistrar registrar_; 477 content::NotificationRegistrar registrar_;
475 478
476 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 479 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
477 }; 480 };
478 481
479 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 482 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698