OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 | 265 |
266 // Returns the InstantController or NULL if there is no InstantController for | 266 // Returns the InstantController or NULL if there is no InstantController for |
267 // this Browser. | 267 // this Browser. |
268 InstantController* instant() const { return instant_.get(); } | 268 InstantController* instant() const { return instant_.get(); } |
269 | 269 |
270 // |window()| will return NULL if called before |CreateBrowserWindow()| | 270 // |window()| will return NULL if called before |CreateBrowserWindow()| |
271 // is done. | 271 // is done. |
272 BrowserWindow* window() const { return window_; } | 272 BrowserWindow* window() const { return window_; } |
273 ToolbarModel* toolbar_model() { return toolbar_model_.get(); } | 273 ToolbarModel* toolbar_model() { return toolbar_model_.get(); } |
274 chrome::search::SearchModel* search_model() { return search_model_.get(); } | 274 chrome::search::SearchModel* search_model() { return search_model_.get(); } |
| 275 chrome::search::SearchDelegate* search_delegate() { |
| 276 return search_delegate_.get(); |
| 277 } |
275 const SessionID& session_id() const { return session_id_; } | 278 const SessionID& session_id() const { return session_id_; } |
276 CommandUpdater* command_updater() { return &command_updater_; } | 279 CommandUpdater* command_updater() { return &command_updater_; } |
277 bool block_command_execution() const { return block_command_execution_; } | 280 bool block_command_execution() const { return block_command_execution_; } |
278 BrowserContentSettingBubbleModelDelegate* | 281 BrowserContentSettingBubbleModelDelegate* |
279 content_setting_bubble_model_delegate() { | 282 content_setting_bubble_model_delegate() { |
280 return content_setting_bubble_model_delegate_.get(); | 283 return content_setting_bubble_model_delegate_.get(); |
281 } | 284 } |
282 BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() { | 285 BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() { |
283 return tab_restore_service_delegate_.get(); | 286 return tab_restore_service_delegate_.get(); |
284 } | 287 } |
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1250 bool window_has_shown_; | 1253 bool window_has_shown_; |
1251 | 1254 |
1252 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1255 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1253 // before DidEndColorChooser is called. | 1256 // before DidEndColorChooser is called. |
1254 scoped_ptr<content::ColorChooser> color_chooser_; | 1257 scoped_ptr<content::ColorChooser> color_chooser_; |
1255 | 1258 |
1256 DISALLOW_COPY_AND_ASSIGN(Browser); | 1259 DISALLOW_COPY_AND_ASSIGN(Browser); |
1257 }; | 1260 }; |
1258 | 1261 |
1259 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1262 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |