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