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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
580 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 580 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
581 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 581 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
582 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 582 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
583 virtual void DidNavigateMainFramePostCommit( | 583 virtual void DidNavigateMainFramePostCommit( |
584 content::WebContents* web_contents) OVERRIDE; | 584 content::WebContents* web_contents) OVERRIDE; |
585 virtual void DidNavigateToPendingEntry( | 585 virtual void DidNavigateToPendingEntry( |
586 content::WebContents* web_contents) OVERRIDE; | 586 content::WebContents* web_contents) OVERRIDE; |
587 virtual content::JavaScriptDialogManager* | 587 virtual content::JavaScriptDialogManager* |
588 GetJavaScriptDialogManager() OVERRIDE; | 588 GetJavaScriptDialogManager() OVERRIDE; |
589 virtual content::ColorChooser* OpenColorChooser( | 589 virtual content::ColorChooser* OpenColorChooser( |
590 content::WebContents* web_contents, SkColor color) OVERRIDE; | 590 content::WebContents* web_contents, |
| 591 SkColor color, |
| 592 const std::vector<SkColor>& suggestions, |
| 593 const std::vector<string16>& suggestion_labels) OVERRIDE; |
591 virtual void RunFileChooser( | 594 virtual void RunFileChooser( |
592 content::WebContents* web_contents, | 595 content::WebContents* web_contents, |
593 const content::FileChooserParams& params) OVERRIDE; | 596 const content::FileChooserParams& params) OVERRIDE; |
594 virtual void EnumerateDirectory(content::WebContents* web_contents, | 597 virtual void EnumerateDirectory(content::WebContents* web_contents, |
595 int request_id, | 598 int request_id, |
596 const base::FilePath& path) OVERRIDE; | 599 const base::FilePath& path) OVERRIDE; |
597 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, | 600 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
598 bool enter_fullscreen) OVERRIDE; | 601 bool enter_fullscreen) OVERRIDE; |
599 virtual bool IsFullscreenForTabOrPending( | 602 virtual bool IsFullscreenForTabOrPending( |
600 const content::WebContents* web_contents) const OVERRIDE; | 603 const content::WebContents* web_contents) const OVERRIDE; |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
909 | 912 |
910 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 913 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
911 | 914 |
912 // True if the browser window has been shown at least once. | 915 // True if the browser window has been shown at least once. |
913 bool window_has_shown_; | 916 bool window_has_shown_; |
914 | 917 |
915 DISALLOW_COPY_AND_ASSIGN(Browser); | 918 DISALLOW_COPY_AND_ASSIGN(Browser); |
916 }; | 919 }; |
917 | 920 |
918 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 921 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |