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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
605 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 605 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
606 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 606 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
607 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 607 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
608 virtual void DidNavigateMainFramePostCommit( | 608 virtual void DidNavigateMainFramePostCommit( |
609 content::WebContents* web_contents) OVERRIDE; | 609 content::WebContents* web_contents) OVERRIDE; |
610 virtual void DidNavigateToPendingEntry( | 610 virtual void DidNavigateToPendingEntry( |
611 content::WebContents* web_contents) OVERRIDE; | 611 content::WebContents* web_contents) OVERRIDE; |
612 virtual content::JavaScriptDialogManager* | 612 virtual content::JavaScriptDialogManager* |
613 GetJavaScriptDialogManager() OVERRIDE; | 613 GetJavaScriptDialogManager() OVERRIDE; |
614 virtual content::ColorChooser* OpenColorChooser( | 614 virtual content::ColorChooser* OpenColorChooser( |
615 content::WebContents* web_contents, SkColor color) OVERRIDE; | 615 content::WebContents* web_contents, |
| 616 SkColor color, |
| 617 const std::vector<SkColor>& suggestions, |
| 618 const std::vector<string16>& suggestion_labels) OVERRIDE; |
616 virtual void RunFileChooser( | 619 virtual void RunFileChooser( |
617 content::WebContents* web_contents, | 620 content::WebContents* web_contents, |
618 const content::FileChooserParams& params) OVERRIDE; | 621 const content::FileChooserParams& params) OVERRIDE; |
619 virtual void EnumerateDirectory(content::WebContents* web_contents, | 622 virtual void EnumerateDirectory(content::WebContents* web_contents, |
620 int request_id, | 623 int request_id, |
621 const base::FilePath& path) OVERRIDE; | 624 const base::FilePath& path) OVERRIDE; |
622 virtual bool EmbedsFullscreenWidget() const OVERRIDE; | 625 virtual bool EmbedsFullscreenWidget() const 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( |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
935 | 938 |
936 // The following factory is used to close the frame at a later time. | 939 // The following factory is used to close the frame at a later time. |
937 base::WeakPtrFactory<Browser> weak_factory_; | 940 base::WeakPtrFactory<Browser> weak_factory_; |
938 | 941 |
939 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; | 942 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; |
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 |