| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 // this BrowserInstantController. | 59 // this BrowserInstantController. |
| 60 InstantController* instant() { return &instant_; } | 60 InstantController* instant() { return &instant_; } |
| 61 | 61 |
| 62 // Invoked by |instant_| to commit the |overlay| by merging it into the active | 62 // Invoked by |instant_| to commit the |overlay| by merging it into the active |
| 63 // tab or adding it as a new tab. | 63 // tab or adding it as a new tab. |
| 64 void CommitInstant(scoped_ptr<content::WebContents> overlay, bool in_new_tab); | 64 void CommitInstant(scoped_ptr<content::WebContents> overlay, bool in_new_tab); |
| 65 | 65 |
| 66 // Invoked by |instant_| to autocomplete the |suggestion| into the omnibox. | 66 // Invoked by |instant_| to autocomplete the |suggestion| into the omnibox. |
| 67 void SetInstantSuggestion(const InstantSuggestion& suggestion); | 67 void SetInstantSuggestion(const InstantSuggestion& suggestion); |
| 68 | 68 |
| 69 // Invoked by |instant_| to commit the omnibox's suggested text. | |
| 70 // Call-through to OmniboxEditModel::CommitSuggestedText. | |
| 71 void CommitSuggestedText(bool skip_inline_autocomplete); | |
| 72 | |
| 73 // Invoked by |instant_| to get the bounds that the overlay is placed at, | 69 // Invoked by |instant_| to get the bounds that the overlay is placed at, |
| 74 // in screen coordinates. | 70 // in screen coordinates. |
| 75 gfx::Rect GetInstantBounds(); | 71 gfx::Rect GetInstantBounds(); |
| 76 | 72 |
| 77 // Invoked by |instant_| to notify that the overlay gained focus, usually due | 73 // Invoked by |instant_| to notify that the overlay gained focus, usually due |
| 78 // to the user clicking on it. | 74 // to the user clicking on it. |
| 79 void InstantOverlayFocused(); | 75 void InstantOverlayFocused(); |
| 80 | 76 |
| 81 // Invoked by |instant_| to give the omnibox focus, with the option of making | 77 // Invoked by |instant_| to give the omnibox focus, with the option of making |
| 82 // the caret invisible. | 78 // the caret invisible. |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 ThemeBackgroundInfo theme_info_; | 137 ThemeBackgroundInfo theme_info_; |
| 142 | 138 |
| 143 PrefChangeRegistrar profile_pref_registrar_; | 139 PrefChangeRegistrar profile_pref_registrar_; |
| 144 | 140 |
| 145 content::NotificationRegistrar registrar_; | 141 content::NotificationRegistrar registrar_; |
| 146 | 142 |
| 147 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); | 143 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); |
| 148 }; | 144 }; |
| 149 | 145 |
| 150 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ | 146 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ |
| OLD | NEW |