| 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 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 | 446 |
| 447 // True when the mouse cursor is locked. | 447 // True when the mouse cursor is locked. |
| 448 bool IsMouseLocked() const; | 448 bool IsMouseLocked() const; |
| 449 | 449 |
| 450 // Called each time the browser window is shown. | 450 // Called each time the browser window is shown. |
| 451 void OnWindowDidShow(); | 451 void OnWindowDidShow(); |
| 452 | 452 |
| 453 // Show the first run search engine bubble on the location bar. | 453 // Show the first run search engine bubble on the location bar. |
| 454 void ShowFirstRunBubble(); | 454 void ShowFirstRunBubble(); |
| 455 | 455 |
| 456 // If necessary, update the bookmark bar state according to the Instant | |
| 457 // overlay state: when Instant overlay shows suggestions and bookmark bar is | |
| 458 // still showing attached, hide it. | |
| 459 void MaybeUpdateBookmarkBarStateForInstantOverlay( | |
| 460 const chrome::search::Mode& mode); | |
| 461 | |
| 462 // Show a download on the download shelf. | 456 // Show a download on the download shelf. |
| 463 void ShowDownload(content::DownloadItem* download); | 457 void ShowDownload(content::DownloadItem* download); |
| 464 | 458 |
| 465 FullscreenController* fullscreen_controller() const { | 459 FullscreenController* fullscreen_controller() const { |
| 466 return fullscreen_controller_.get(); | 460 return fullscreen_controller_.get(); |
| 467 } | 461 } |
| 468 | 462 |
| 469 extensions::WindowController* extension_window_controller() const { | 463 extensions::WindowController* extension_window_controller() const { |
| 470 return extension_window_controller_.get(); | 464 return extension_window_controller_.get(); |
| 471 } | 465 } |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 const ui::SelectedFileInfo& file_info, | 667 const ui::SelectedFileInfo& file_info, |
| 674 int index, | 668 int index, |
| 675 void* params) OVERRIDE; | 669 void* params) OVERRIDE; |
| 676 | 670 |
| 677 // Overridden from content::NotificationObserver: | 671 // Overridden from content::NotificationObserver: |
| 678 virtual void Observe(int type, | 672 virtual void Observe(int type, |
| 679 const content::NotificationSource& source, | 673 const content::NotificationSource& source, |
| 680 const content::NotificationDetails& details) OVERRIDE; | 674 const content::NotificationDetails& details) OVERRIDE; |
| 681 | 675 |
| 682 // Overridden from chrome::search::SearchModelObserver: | 676 // Overridden from chrome::search::SearchModelObserver: |
| 683 virtual void ModeChanged(const chrome::search::Mode& old_mode, | 677 virtual void ModelChanged( |
| 684 const chrome::search::Mode& new_mode) OVERRIDE; | 678 const chrome::search::SearchModel::State& old_state, |
| 679 const chrome::search::SearchModel::State& new_state) OVERRIDE; |
| 685 | 680 |
| 686 // Command and state updating /////////////////////////////////////////////// | 681 // Command and state updating /////////////////////////////////////////////// |
| 687 | 682 |
| 688 // Handle changes to kDevTools preference. | 683 // Handle changes to kDevTools preference. |
| 689 void OnDevToolsDisabledChanged(); | 684 void OnDevToolsDisabledChanged(); |
| 690 | 685 |
| 691 // Set the preference that indicates that the home page has been changed. | 686 // Set the preference that indicates that the home page has been changed. |
| 692 void MarkHomePageAsChanged(); | 687 void MarkHomePageAsChanged(); |
| 693 | 688 |
| 694 // UI update coalescing and handling //////////////////////////////////////// | 689 // UI update coalescing and handling //////////////////////////////////////// |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 925 bool window_has_shown_; | 920 bool window_has_shown_; |
| 926 | 921 |
| 927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 922 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 928 // before DidEndColorChooser is called. | 923 // before DidEndColorChooser is called. |
| 929 scoped_ptr<content::ColorChooser> color_chooser_; | 924 scoped_ptr<content::ColorChooser> color_chooser_; |
| 930 | 925 |
| 931 DISALLOW_COPY_AND_ASSIGN(Browser); | 926 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 932 }; | 927 }; |
| 933 | 928 |
| 934 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 929 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |