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

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

Issue 10885024: Integrate Chrome To Mobile with Action Box UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nil/NULL checks in ChromeToMobileBubbleController. Created 8 years, 3 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 | Annotate | Revision Log
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 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "ui/gfx/font.h" 24 #include "ui/gfx/font.h"
25 #include "ui/gfx/rect.h" 25 #include "ui/gfx/rect.h"
26 #include "ui/views/controls/native/native_view_host.h" 26 #include "ui/views/controls/native/native_view_host.h"
27 #include "ui/views/drag_controller.h" 27 #include "ui/views/drag_controller.h"
28 28
29 #if defined(USE_AURA) 29 #if defined(USE_AURA)
30 #include "ui/compositor/layer_animation_observer.h" 30 #include "ui/compositor/layer_animation_observer.h"
31 #endif 31 #endif
32 32
33 class ActionBoxButtonView; 33 class ActionBoxButtonView;
34 class ChromeToMobileView;
35 class CommandUpdater; 34 class CommandUpdater;
36 class ContentSettingBubbleModelDelegate; 35 class ContentSettingBubbleModelDelegate;
37 class ContentSettingImageView; 36 class ContentSettingImageView;
38 class EVBubbleView; 37 class EVBubbleView;
39 class ExtensionAction; 38 class ExtensionAction;
40 class GURL; 39 class GURL;
41 class InstantController; 40 class InstantController;
42 class KeywordHintView; 41 class KeywordHintView;
43 class LocationIconView; 42 class LocationIconView;
44 class PageActionWithBadgeView; 43 class PageActionWithBadgeView;
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 521
523 // The page action icon views. 522 // The page action icon views.
524 PageActionViews page_action_views_; 523 PageActionViews page_action_views_;
525 524
526 // The star. 525 // The star.
527 StarView* star_view_; 526 StarView* star_view_;
528 527
529 // The action box button (plus). 528 // The action box button (plus).
530 ActionBoxButtonView* action_box_button_view_; 529 ActionBoxButtonView* action_box_button_view_;
531 530
532 // The Chrome To Mobile page action icon view.
533 ChromeToMobileView* chrome_to_mobile_view_;
534
535 // The mode that dictates how the bar shows. 531 // The mode that dictates how the bar shows.
536 Mode mode_; 532 Mode mode_;
537 533
538 // True if we should show a focus rect while the location entry field is 534 // True if we should show a focus rect while the location entry field is
539 // focused. Used when the toolbar is in full keyboard accessibility mode. 535 // focused. Used when the toolbar is in full keyboard accessibility mode.
540 bool show_focus_rect_; 536 bool show_focus_rect_;
541 537
542 // This is in case we're destroyed before the model loads. We need to make 538 // This is in case we're destroyed before the model loads. We need to make
543 // Add/RemoveObserver calls. 539 // Add/RemoveObserver calls.
544 TemplateURLService* template_url_service_; 540 TemplateURLService* template_url_service_;
(...skipping 16 matching lines...) Expand all
561 557
562 #if defined(USE_AURA) 558 #if defined(USE_AURA)
563 // Observer for a fade-in animation. 559 // Observer for a fade-in animation.
564 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 560 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
565 #endif 561 #endif
566 562
567 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 563 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
568 }; 564 };
569 565
570 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 566 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698