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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 606 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
607 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 607 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
608 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 608 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
609 virtual void DidNavigateMainFramePostCommit( | 609 virtual void DidNavigateMainFramePostCommit( |
610 content::WebContents* web_contents) OVERRIDE; | 610 content::WebContents* web_contents) OVERRIDE; |
611 virtual void DidNavigateToPendingEntry( | 611 virtual void DidNavigateToPendingEntry( |
612 content::WebContents* web_contents) OVERRIDE; | 612 content::WebContents* web_contents) OVERRIDE; |
613 virtual content::JavaScriptDialogManager* | 613 virtual content::JavaScriptDialogManager* |
614 GetJavaScriptDialogManager() OVERRIDE; | 614 GetJavaScriptDialogManager() OVERRIDE; |
615 virtual content::ColorChooser* OpenColorChooser( | 615 virtual content::ColorChooser* OpenColorChooser( |
616 content::WebContents* web_contents, SkColor color) OVERRIDE; | 616 content::WebContents* web_contents, |
| 617 SkColor color, |
| 618 const std::vector<SkColor>& suggestions, |
| 619 const std::vector<string16>& suggestion_labels) OVERRIDE; |
617 virtual void RunFileChooser( | 620 virtual void RunFileChooser( |
618 content::WebContents* web_contents, | 621 content::WebContents* web_contents, |
619 const content::FileChooserParams& params) OVERRIDE; | 622 const content::FileChooserParams& params) OVERRIDE; |
620 virtual void EnumerateDirectory(content::WebContents* web_contents, | 623 virtual void EnumerateDirectory(content::WebContents* web_contents, |
621 int request_id, | 624 int request_id, |
622 const base::FilePath& path) OVERRIDE; | 625 const base::FilePath& path) OVERRIDE; |
623 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, | 626 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
624 bool enter_fullscreen) OVERRIDE; | 627 bool enter_fullscreen) OVERRIDE; |
625 virtual bool IsFullscreenForTabOrPending( | 628 virtual bool IsFullscreenForTabOrPending( |
626 const content::WebContents* web_contents) const OVERRIDE; | 629 const content::WebContents* web_contents) const OVERRIDE; |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 | 941 |
939 scoped_ptr<chrome::BrowserCommandController> command_controller_; | 942 scoped_ptr<chrome::BrowserCommandController> command_controller_; |
940 | 943 |
941 // True if the browser window has been shown at least once. | 944 // True if the browser window has been shown at least once. |
942 bool window_has_shown_; | 945 bool window_has_shown_; |
943 | 946 |
944 DISALLOW_COPY_AND_ASSIGN(Browser); | 947 DISALLOW_COPY_AND_ASSIGN(Browser); |
945 }; | 948 }; |
946 | 949 |
947 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 950 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |