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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 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_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_
6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_ 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 private: 68 private:
69 enum FetchState { 69 enum FetchState {
70 FETCH_NOT_COMPLETE, 70 FETCH_NOT_COMPLETE,
71 FETCH_SUCCEEDED, 71 FETCH_SUCCEEDED,
72 FETCH_FAILED, 72 FETCH_FAILED,
73 }; 73 };
74 74
75 // content::NotificationObserver: 75 // content::NotificationObserver:
76 virtual void Observe(int type, 76 virtual void Observe(int type,
77 const content::NotificationSource& source, 77 const content::NotificationSource& source,
78 const content::NotificationDetails& details) OVERRIDE; 78 const content::NotificationDetails& details) override;
79 79
80 // content::WebContentsObserver: 80 // content::WebContentsObserver:
81 virtual void DidStartNavigationToPendingEntry( 81 virtual void DidStartNavigationToPendingEntry(
82 const GURL& url, 82 const GURL& url,
83 content::NavigationController::ReloadType reload_type) OVERRIDE; 83 content::NavigationController::ReloadType reload_type) override;
84 virtual void NavigationEntryCommitted( 84 virtual void NavigationEntryCommitted(
85 const content::LoadCommittedDetails& load_details) OVERRIDE; 85 const content::LoadCommittedDetails& load_details) override;
86 virtual void WebContentsDestroyed() OVERRIDE; 86 virtual void WebContentsDestroyed() override;
87 87
88 // net::URLFetcherDelegate: 88 // net::URLFetcherDelegate:
89 virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; 89 virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
90 90
91 // Once the load has committed and any URL fetch has completed, this displays 91 // Once the load has committed and any URL fetch has completed, this displays
92 // the alternate nav infobar if necessary, and deletes |this|. 92 // the alternate nav infobar if necessary, and deletes |this|.
93 void OnAllLoadingFinished(); 93 void OnAllLoadingFinished();
94 94
95 const base::string16 text_; 95 const base::string16 text_;
96 const AutocompleteMatch match_; 96 const AutocompleteMatch match_;
97 const AutocompleteMatch alternate_nav_match_; 97 const AutocompleteMatch alternate_nav_match_;
98 scoped_refptr<ShortcutsBackend> shortcuts_backend_; // NULL in incognito. 98 scoped_refptr<ShortcutsBackend> shortcuts_backend_; // NULL in incognito.
99 scoped_ptr<net::URLFetcher> fetcher_; 99 scoped_ptr<net::URLFetcher> fetcher_;
100 LoadState load_state_; 100 LoadState load_state_;
101 FetchState fetch_state_; 101 FetchState fetch_state_;
102 102
103 content::NotificationRegistrar registrar_; 103 content::NotificationRegistrar registrar_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(OmniboxNavigationObserver); 105 DISALLOW_COPY_AND_ASSIGN(OmniboxNavigationObserver);
106 }; 106 };
107 107
108 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_ 108 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_NAVIGATION_OBSERVER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_edit_unittest.cc ('k') | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698