| 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 | 449 |
| 450 // True when the mouse cursor is locked. | 450 // True when the mouse cursor is locked. |
| 451 bool IsMouseLocked() const; | 451 bool IsMouseLocked() const; |
| 452 | 452 |
| 453 // Called each time the browser window is shown. | 453 // Called each time the browser window is shown. |
| 454 void OnWindowDidShow(); | 454 void OnWindowDidShow(); |
| 455 | 455 |
| 456 // Show the first run search engine bubble on the location bar. | 456 // Show the first run search engine bubble on the location bar. |
| 457 void ShowFirstRunBubble(); | 457 void ShowFirstRunBubble(); |
| 458 | 458 |
| 459 // If necessary, update the bookmark bar state according to the instant | 459 // If necessary, update the bookmark bar state according to the Instant |
| 460 // preview state: when instant preview shows suggestions and bookmark bar is | 460 // overlay state: when Instant overlay shows suggestions and bookmark bar is |
| 461 // still showing attached, hide it. | 461 // still showing attached, hide it. |
| 462 void MaybeUpdateBookmarkBarStateForInstantPreview( | 462 void MaybeUpdateBookmarkBarStateForInstantOverlay(); |
| 463 const chrome::search::Mode& mode); | |
| 464 | 463 |
| 465 FullscreenController* fullscreen_controller() const { | 464 FullscreenController* fullscreen_controller() const { |
| 466 return fullscreen_controller_.get(); | 465 return fullscreen_controller_.get(); |
| 467 } | 466 } |
| 468 | 467 |
| 469 extensions::WindowController* extension_window_controller() const { | 468 extensions::WindowController* extension_window_controller() const { |
| 470 return extension_window_controller_.get(); | 469 return extension_window_controller_.get(); |
| 471 } | 470 } |
| 472 | 471 |
| 473 private: | 472 private: |
| (...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 923 bool window_has_shown_; | 922 bool window_has_shown_; |
| 924 | 923 |
| 925 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 924 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 926 // before DidEndColorChooser is called. | 925 // before DidEndColorChooser is called. |
| 927 scoped_ptr<content::ColorChooser> color_chooser_; | 926 scoped_ptr<content::ColorChooser> color_chooser_; |
| 928 | 927 |
| 929 DISALLOW_COPY_AND_ASSIGN(Browser); | 928 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 930 }; | 929 }; |
| 931 | 930 |
| 932 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 931 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |