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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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
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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // directions from its current location. 335 // directions from its current location.
336 double GetValueForAnimation(bool hide) const; 336 double GetValueForAnimation(bool hide) const;
337 337
338 // Resets |show_url_animation_| and the color changes it causes. 338 // Resets |show_url_animation_| and the color changes it causes.
339 void ResetShowAnimationAndColors(); 339 void ResetShowAnimationAndColors();
340 340
341 // LocationBar: 341 // LocationBar:
342 virtual void ShowFirstRunBubble() OVERRIDE; 342 virtual void ShowFirstRunBubble() OVERRIDE;
343 virtual GURL GetDestinationURL() const OVERRIDE; 343 virtual GURL GetDestinationURL() const OVERRIDE;
344 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 344 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
345 virtual content::PageTransition GetPageTransition() const OVERRIDE; 345 virtual ui::PageTransition GetPageTransition() const OVERRIDE;
346 virtual void AcceptInput() OVERRIDE; 346 virtual void AcceptInput() OVERRIDE;
347 virtual void FocusSearch() OVERRIDE; 347 virtual void FocusSearch() OVERRIDE;
348 virtual void UpdateContentSettingsIcons() OVERRIDE; 348 virtual void UpdateContentSettingsIcons() OVERRIDE;
349 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE; 349 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE;
350 virtual void UpdatePageActions() OVERRIDE; 350 virtual void UpdatePageActions() OVERRIDE;
351 virtual void InvalidatePageActions() OVERRIDE; 351 virtual void InvalidatePageActions() OVERRIDE;
352 virtual void UpdateBookmarkStarVisibility() OVERRIDE; 352 virtual void UpdateBookmarkStarVisibility() OVERRIDE;
353 virtual bool ShowPageActionPopup(const extensions::Extension* extension, 353 virtual bool ShowPageActionPopup(const extensions::Extension* extension,
354 bool grant_active_tab) OVERRIDE; 354 bool grant_active_tab) OVERRIDE;
355 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 355 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 // The width is always positive. The ending width is the width of the entire 545 // The width is always positive. The ending width is the width of the entire
546 // omnibox URL. As the show animation runs, the current width gradually moves 546 // omnibox URL. As the show animation runs, the current width gradually moves
547 // from the width of the hostname to the ending value. 547 // from the width of the hostname to the ending value.
548 int current_omnibox_width_; 548 int current_omnibox_width_;
549 int ending_omnibox_width_; 549 int ending_omnibox_width_;
550 550
551 DISALLOW_COPY_AND_ASSIGN(LocationBarView); 551 DISALLOW_COPY_AND_ASSIGN(LocationBarView);
552 }; 552 };
553 553
554 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 554 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/global_menu_bar_x11.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