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

Side by Side Diff: chrome/browser/ui/browser_instant_controller.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_BROWSER_INSTANT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 // Invoked by |browser_| when the active tab changes. 44 // Invoked by |browser_| when the active tab changes.
45 void ActiveTabChanged(); 45 void ActiveTabChanged();
46 46
47 // Invoked by |browser_| when the active tab is about to be deactivated. 47 // Invoked by |browser_| when the active tab is about to be deactivated.
48 void TabDeactivated(content::WebContents* contents); 48 void TabDeactivated(content::WebContents* contents);
49 49
50 private: 50 private:
51 // SearchModelObserver: 51 // SearchModelObserver:
52 virtual void ModelChanged(const SearchModel::State& old_state, 52 virtual void ModelChanged(const SearchModel::State& old_state,
53 const SearchModel::State& new_state) OVERRIDE; 53 const SearchModel::State& new_state) override;
54 54
55 // InstantServiceObserver: 55 // InstantServiceObserver:
56 virtual void DefaultSearchProviderChanged() OVERRIDE; 56 virtual void DefaultSearchProviderChanged() override;
57 57
58 // Replaces the contents at tab |index| with |new_contents| and deletes the 58 // Replaces the contents at tab |index| with |new_contents| and deletes the
59 // existing contents. 59 // existing contents.
60 void ReplaceWebContentsAt(int index, 60 void ReplaceWebContentsAt(int index,
61 scoped_ptr<content::WebContents> new_contents); 61 scoped_ptr<content::WebContents> new_contents);
62 62
63 Browser* const browser_; 63 Browser* const browser_;
64 64
65 InstantController instant_; 65 InstantController instant_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); 67 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
68 }; 68 };
69 69
70 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 70 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_focus_uitest.cc ('k') | chrome/browser/ui/browser_instant_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698