| OLD | NEW |
| 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 "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "chrome/browser/search/instant_service_observer.h" | 10 #include "chrome/browser/search/instant_service_observer.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 void ModelChanged(const SearchModel::State& old_state, | 49 void ModelChanged(const SearchModel::State& old_state, |
| 50 const SearchModel::State& new_state) override; | 50 const SearchModel::State& new_state) override; |
| 51 | 51 |
| 52 // InstantServiceObserver: | 52 // InstantServiceObserver: |
| 53 void DefaultSearchProviderChanged( | 53 void DefaultSearchProviderChanged( |
| 54 bool google_base_url_domain_changed) override; | 54 bool google_base_url_domain_changed) override; |
| 55 | 55 |
| 56 // Replaces the contents at tab |index| with |new_contents| and deletes the | 56 // Replaces the contents at tab |index| with |new_contents| and deletes the |
| 57 // existing contents. | 57 // existing contents. |
| 58 void ReplaceWebContentsAt(int index, | 58 void ReplaceWebContentsAt(int index, |
| 59 scoped_ptr<content::WebContents> new_contents); | 59 std::unique_ptr<content::WebContents> new_contents); |
| 60 | 60 |
| 61 Browser* const browser_; | 61 Browser* const browser_; |
| 62 | 62 |
| 63 InstantController instant_; | 63 InstantController instant_; |
| 64 | 64 |
| 65 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); | 65 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ | 68 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ |
| OLD | NEW |