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

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_edit_controller.h

Issue 302453002: New animation for the origin chip URL showing/hiding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test failure by checking for NULL extension Created 6 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 | 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_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "content/public/common/page_transition_types.h" 9 #include "content/public/common/page_transition_types.h"
10 #include "ui/base/window_open_disposition.h" 10 #include "ui/base/window_open_disposition.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // Hides the origin chip and shows the URL. 47 // Hides the origin chip and shows the URL.
48 virtual void ShowURL() = 0; 48 virtual void ShowURL() = 0;
49 49
50 // Hides the origin chip while leaving the Omnibox empty. 50 // Hides the origin chip while leaving the Omnibox empty.
51 void HideOriginChip(); 51 void HideOriginChip();
52 52
53 // Shows the origin chip. Hides the URL if it was previously shown by a call 53 // Shows the origin chip. Hides the URL if it was previously shown by a call
54 // to ShowURL(). 54 // to ShowURL().
55 void ShowOriginChip(); 55 void ShowOriginChip();
56 56
57 // Ends any in-progress animations related to showing/hiding the origin chip.
58 // If |cancel_fade| is false, we still allow the chip itself to fade in if
59 // we're ending a currently-running hide animation.
60 virtual void EndOriginChipAnimations(bool cancel_fade) = 0;
61
57 // Returns the InstantController, or NULL if instant is not enabled. 62 // Returns the InstantController, or NULL if instant is not enabled.
58 virtual InstantController* GetInstant() = 0; 63 virtual InstantController* GetInstant() = 0;
59 64
60 // Returns the WebContents of the currently active tab. 65 // Returns the WebContents of the currently active tab.
61 virtual content::WebContents* GetWebContents() = 0; 66 virtual content::WebContents* GetWebContents() = 0;
62 67
63 virtual ToolbarModel* GetToolbarModel() = 0; 68 virtual ToolbarModel* GetToolbarModel() = 0;
64 virtual const ToolbarModel* GetToolbarModel() const = 0; 69 virtual const ToolbarModel* GetToolbarModel() const = 0;
65 70
66 protected: 71 protected:
(...skipping 13 matching lines...) Expand all
80 85
81 // The details necessary to open the user's desired omnibox match. 86 // The details necessary to open the user's desired omnibox match.
82 GURL destination_url_; 87 GURL destination_url_;
83 WindowOpenDisposition disposition_; 88 WindowOpenDisposition disposition_;
84 content::PageTransition transition_; 89 content::PageTransition transition_;
85 90
86 DISALLOW_COPY_AND_ASSIGN(OmniboxEditController); 91 DISALLOW_COPY_AND_ASSIGN(OmniboxEditController);
87 }; 92 };
88 93
89 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_ 94 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698