| 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 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 608 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
| 609 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 609 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
| 610 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 610 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
| 611 virtual void DidNavigateMainFramePostCommit( | 611 virtual void DidNavigateMainFramePostCommit( |
| 612 content::WebContents* web_contents) OVERRIDE; | 612 content::WebContents* web_contents) OVERRIDE; |
| 613 virtual void DidNavigateToPendingEntry( | 613 virtual void DidNavigateToPendingEntry( |
| 614 content::WebContents* web_contents) OVERRIDE; | 614 content::WebContents* web_contents) OVERRIDE; |
| 615 virtual content::JavaScriptDialogManager* | 615 virtual content::JavaScriptDialogManager* |
| 616 GetJavaScriptDialogManager() OVERRIDE; | 616 GetJavaScriptDialogManager() OVERRIDE; |
| 617 virtual content::ColorChooser* OpenColorChooser( | 617 virtual content::ColorChooser* OpenColorChooser( |
| 618 content::WebContents* web_contents, SkColor color) OVERRIDE; | 618 content::WebContents* web_contents, |
| 619 SkColor color, |
| 620 const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; |
| 619 virtual void RunFileChooser( | 621 virtual void RunFileChooser( |
| 620 content::WebContents* web_contents, | 622 content::WebContents* web_contents, |
| 621 const content::FileChooserParams& params) OVERRIDE; | 623 const content::FileChooserParams& params) OVERRIDE; |
| 622 virtual void EnumerateDirectory(content::WebContents* web_contents, | 624 virtual void EnumerateDirectory(content::WebContents* web_contents, |
| 623 int request_id, | 625 int request_id, |
| 624 const base::FilePath& path) OVERRIDE; | 626 const base::FilePath& path) OVERRIDE; |
| 625 virtual bool EmbedsFullscreenWidget() const OVERRIDE; | 627 virtual bool EmbedsFullscreenWidget() const OVERRIDE; |
| 626 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, | 628 virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents, |
| 627 bool enter_fullscreen) OVERRIDE; | 629 bool enter_fullscreen) OVERRIDE; |
| 628 virtual bool IsFullscreenForTabOrPending( | 630 virtual bool IsFullscreenForTabOrPending( |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 938 | 940 |
| 939 // The following factory is used to close the frame at a later time. | 941 // The following factory is used to close the frame at a later time. |
| 940 base::WeakPtrFactory<Browser> weak_factory_; | 942 base::WeakPtrFactory<Browser> weak_factory_; |
| 941 | 943 |
| 942 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; | 944 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; |
| 943 | 945 |
| 944 DISALLOW_COPY_AND_ASSIGN(Browser); | 946 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 945 }; | 947 }; |
| 946 | 948 |
| 947 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 949 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |