| 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/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/prefs/public/pref_change_registrar.h" | 10 #include "base/prefs/public/pref_change_registrar.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 81 |
| 82 // Invoked by |BrowserWindow| during layout to set content height which is | 82 // Invoked by |BrowserWindow| during layout to set content height which is |
| 83 // used as theme area height, i.e. the height of the area that the entire | 83 // used as theme area height, i.e. the height of the area that the entire |
| 84 // theme background image should fill up. | 84 // theme background image should fill up. |
| 85 void SetContentHeight(int height); | 85 void SetContentHeight(int height); |
| 86 | 86 |
| 87 // Invoked by |instant_| to update theme information for preview. | 87 // Invoked by |instant_| to update theme information for preview. |
| 88 void UpdateThemeInfoForPreview(); | 88 void UpdateThemeInfoForPreview(); |
| 89 | 89 |
| 90 // Invoked by the InstantController when it wants to open a URL. | 90 // Invoked by the InstantController when it wants to open a URL. |
| 91 void OpenURLInCurrentTab(const GURL& url, content::PageTransition transition); | 91 void OpenURL(const GURL& url, |
| 92 content::PageTransition transition, |
| 93 WindowOpenDisposition disposition); |
| 92 | 94 |
| 93 // Sets the start and end margins of the omnibox text area. | 95 // Sets the start and end margins of the omnibox text area. |
| 94 void SetMarginSize(int start, int end); | 96 void SetMarginSize(int start, int end); |
| 95 | 97 |
| 96 private: | 98 private: |
| 97 // Sets the value of |instant_| based on value from profile. Invoked | 99 // Sets the value of |instant_| based on value from profile. Invoked |
| 98 // on pref change. | 100 // on pref change. |
| 99 void ResetInstant(); | 101 void ResetInstant(); |
| 100 | 102 |
| 101 // Overridden from search::SearchModelObserver: | 103 // Overridden from search::SearchModelObserver: |
| (...skipping 24 matching lines...) Expand all Loading... |
| 126 PrefChangeRegistrar profile_pref_registrar_; | 128 PrefChangeRegistrar profile_pref_registrar_; |
| 127 | 129 |
| 128 content::NotificationRegistrar registrar_; | 130 content::NotificationRegistrar registrar_; |
| 129 | 131 |
| 130 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); | 132 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); |
| 131 }; | 133 }; |
| 132 | 134 |
| 133 } // namespace chrome | 135 } // namespace chrome |
| 134 | 136 |
| 135 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ | 137 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ |
| OLD | NEW |