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

Side by Side Diff: chrome/browser/ui/search/instant_page.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SEARCH_INSTANT_PAGE_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_ 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, 95 FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
96 DetermineIfPageSupportsInstant_NonLocal); 96 DetermineIfPageSupportsInstant_NonLocal);
97 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, 97 FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
98 PageURLDoesntBelongToInstantRenderer); 98 PageURLDoesntBelongToInstantRenderer);
99 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant); 99 FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant);
100 100
101 // Overridden from content::WebContentsObserver: 101 // Overridden from content::WebContentsObserver:
102 virtual void DidCommitProvisionalLoadForFrame( 102 virtual void DidCommitProvisionalLoadForFrame(
103 content::RenderFrameHost* render_frame_host, 103 content::RenderFrameHost* render_frame_host,
104 const GURL& url, 104 const GURL& url,
105 ui::PageTransition transition_type) OVERRIDE; 105 ui::PageTransition transition_type) override;
106 106
107 // Overridden from SearchModelObserver: 107 // Overridden from SearchModelObserver:
108 virtual void ModelChanged(const SearchModel::State& old_state, 108 virtual void ModelChanged(const SearchModel::State& old_state,
109 const SearchModel::State& new_state) OVERRIDE; 109 const SearchModel::State& new_state) override;
110 110
111 // Update the status of Instant support. 111 // Update the status of Instant support.
112 void InstantSupportDetermined(bool supports_instant); 112 void InstantSupportDetermined(bool supports_instant);
113 113
114 void ClearContents(); 114 void ClearContents();
115 115
116 // TODO(kmadhusu): Remove |profile_| from here and update InstantNTP to get 116 // TODO(kmadhusu): Remove |profile_| from here and update InstantNTP to get
117 // |profile| from InstantNTPPrerenderer. 117 // |profile| from InstantNTPPrerenderer.
118 Profile* profile_; 118 Profile* profile_;
119 119
120 Delegate* const delegate_; 120 Delegate* const delegate_;
121 const std::string instant_url_; 121 const std::string instant_url_;
122 const bool is_incognito_; 122 const bool is_incognito_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(InstantPage); 124 DISALLOW_COPY_AND_ASSIGN(InstantPage);
125 }; 125 };
126 126
127 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_ 127 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698