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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_model_impl.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 18 matching lines...) Expand all
29 // edit. It populates its states from the current navigation entry retrieved 29 // edit. It populates its states from the current navigation entry retrieved
30 // from the navigation controller returned by GetNavigationController(). 30 // from the navigation controller returned by GetNavigationController().
31 class ToolbarModelImpl : public ToolbarModel { 31 class ToolbarModelImpl : public ToolbarModel {
32 public: 32 public:
33 explicit ToolbarModelImpl(ToolbarModelDelegate* delegate); 33 explicit ToolbarModelImpl(ToolbarModelDelegate* delegate);
34 virtual ~ToolbarModelImpl(); 34 virtual ~ToolbarModelImpl();
35 35
36 static SecurityLevel GetSecurityLevelForWebContents( 36 static SecurityLevel GetSecurityLevelForWebContents(
37 content::WebContents* web_contents); 37 content::WebContents* web_contents);
38 38
39 // Returns "<organization_name> [<country>]".
40 static base::string16 GetEVCertName(const net::X509Certificate& cert);
41
42 private: 39 private:
43 // ToolbarModel: 40 // ToolbarModel:
44 virtual base::string16 GetText() const OVERRIDE; 41 virtual base::string16 GetText() const OVERRIDE;
45 virtual base::string16 GetFormattedURL() const OVERRIDE; 42 virtual base::string16 GetFormattedURL(size_t* prefix_end) const OVERRIDE;
46 virtual base::string16 GetCorpusNameForMobile() const OVERRIDE; 43 virtual base::string16 GetCorpusNameForMobile() const OVERRIDE;
47 virtual GURL GetURL() const OVERRIDE; 44 virtual GURL GetURL() const OVERRIDE;
48 virtual bool WouldPerformSearchTermReplacement( 45 virtual bool WouldPerformSearchTermReplacement(
49 bool ignore_editing) const OVERRIDE; 46 bool ignore_editing) const OVERRIDE;
50 virtual SecurityLevel GetSecurityLevel(bool ignore_editing) const OVERRIDE; 47 virtual SecurityLevel GetSecurityLevel(bool ignore_editing) const OVERRIDE;
51 virtual int GetIcon() const OVERRIDE; 48 virtual int GetIcon() const OVERRIDE;
52 virtual int GetIconForSecurityLevel(SecurityLevel level) const OVERRIDE; 49 virtual int GetIconForSecurityLevel(SecurityLevel level) const OVERRIDE;
53 virtual base::string16 GetEVCertName() const OVERRIDE; 50 virtual base::string16 GetEVCertName() const OVERRIDE;
54 virtual bool ShouldDisplayURL() const OVERRIDE; 51 virtual bool ShouldDisplayURL() const OVERRIDE;
55 virtual bool WouldOmitURLDueToOriginChip() const OVERRIDE; 52 virtual bool WouldOmitURLDueToOriginChip() const OVERRIDE;
(...skipping 11 matching lines...) Expand all
67 // replacement is enabled, editing is not in progress, etc.). If 64 // replacement is enabled, editing is not in progress, etc.). If
68 // |ignore_editing| is true, the "editing not in progress" check is skipped. 65 // |ignore_editing| is true, the "editing not in progress" check is skipped.
69 base::string16 GetSearchTerms(bool ignore_editing) const; 66 base::string16 GetSearchTerms(bool ignore_editing) const;
70 67
71 ToolbarModelDelegate* delegate_; 68 ToolbarModelDelegate* delegate_;
72 69
73 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl); 70 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl);
74 }; 71 };
75 72
76 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 73 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698