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

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

Issue 10828193: Revert 148511 - Add pin icon to the omnibar in windows 8 metro mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 24 matching lines...) Expand all
35 class ChromeToMobileView; 35 class ChromeToMobileView;
36 class CommandUpdater; 36 class CommandUpdater;
37 class ContentSettingBubbleModelDelegate; 37 class ContentSettingBubbleModelDelegate;
38 class ContentSettingImageView; 38 class ContentSettingImageView;
39 class EVBubbleView; 39 class EVBubbleView;
40 class ExtensionAction; 40 class ExtensionAction;
41 class GURL; 41 class GURL;
42 class InstantController; 42 class InstantController;
43 class KeywordHintView; 43 class KeywordHintView;
44 class LocationIconView; 44 class LocationIconView;
45 class MetroPinView;
46 class PageActionWithBadgeView; 45 class PageActionWithBadgeView;
47 class PageActionImageView; 46 class PageActionImageView;
48 class Profile; 47 class Profile;
49 class SelectedKeywordView; 48 class SelectedKeywordView;
50 class StarView; 49 class StarView;
51 class SuggestedTextView; 50 class SuggestedTextView;
52 class TabContents; 51 class TabContents;
53 class TemplateURLService; 52 class TemplateURLService;
54 class ZoomView; 53 class ZoomView;
55 54
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 202
204 // Retrieves the PageAction View which is associated with |page_action|. 203 // Retrieves the PageAction View which is associated with |page_action|.
205 views::View* GetPageActionView(ExtensionAction* page_action); 204 views::View* GetPageActionView(ExtensionAction* page_action);
206 205
207 // Toggles the star on or off. 206 // Toggles the star on or off.
208 void SetStarToggled(bool on); 207 void SetStarToggled(bool on);
209 208
210 // Shows the bookmark bubble. 209 // Shows the bookmark bubble.
211 void ShowStarBubble(const GURL& url, bool newly_bookmarked); 210 void ShowStarBubble(const GURL& url, bool newly_bookmarked);
212 211
213 // Toggles the metro pin on or off.
214 void SetMetroPinnedState(bool is_pinned);
215
216 // Shows the Chrome To Mobile bubble. 212 // Shows the Chrome To Mobile bubble.
217 void ShowChromeToMobileBubble(); 213 void ShowChromeToMobileBubble();
218 214
219 // Returns the screen coordinates of the location entry (where the URL text 215 // Returns the screen coordinates of the location entry (where the URL text
220 // appears, not where the icons are shown). 216 // appears, not where the icons are shown).
221 gfx::Point GetLocationEntryOrigin() const; 217 gfx::Point GetLocationEntryOrigin() const;
222 218
223 // Invoked from OmniboxViewWin to show the instant suggestion. 219 // Invoked from OmniboxViewWin to show the instant suggestion.
224 void SetInstantSuggestion(const string16& text, 220 void SetInstantSuggestion(const string16& text,
225 bool animate_to_complete); 221 bool animate_to_complete);
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 519
524 // The star. 520 // The star.
525 StarView* star_view_; 521 StarView* star_view_;
526 522
527 // The action box button (plus). 523 // The action box button (plus).
528 ActionBoxButtonView* action_box_button_view_; 524 ActionBoxButtonView* action_box_button_view_;
529 525
530 // The Chrome To Mobile page action icon view. 526 // The Chrome To Mobile page action icon view.
531 ChromeToMobileView* chrome_to_mobile_view_; 527 ChromeToMobileView* chrome_to_mobile_view_;
532 528
533 // The button to pin the page to the Metro start screen.
534 MetroPinView* metro_pin_view_;
535
536 // The mode that dictates how the bar shows. 529 // The mode that dictates how the bar shows.
537 Mode mode_; 530 Mode mode_;
538 531
539 // True if we should show a focus rect while the location entry field is 532 // True if we should show a focus rect while the location entry field is
540 // focused. Used when the toolbar is in full keyboard accessibility mode. 533 // focused. Used when the toolbar is in full keyboard accessibility mode.
541 bool show_focus_rect_; 534 bool show_focus_rect_;
542 535
543 // This is in case we're destroyed before the model loads. We need to make 536 // This is in case we're destroyed before the model loads. We need to make
544 // Add/RemoveObserver calls. 537 // Add/RemoveObserver calls.
545 TemplateURLService* template_url_service_; 538 TemplateURLService* template_url_service_;
(...skipping 16 matching lines...) Expand all
562 555
563 #if defined(USE_AURA) 556 #if defined(USE_AURA)
564 // Observer for a fade-in animation. 557 // Observer for a fade-in animation.
565 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 558 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
566 #endif 559 #endif
567 560
568 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 561 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
569 }; 562 };
570 563
571 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 564 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.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