| 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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 void WebContentsCreated(content::WebContents* source_contents, | 591 void WebContentsCreated(content::WebContents* source_contents, |
| 592 int opener_render_frame_id, | 592 int opener_render_frame_id, |
| 593 const base::string16& frame_name, | 593 const base::string16& frame_name, |
| 594 const GURL& target_url, | 594 const GURL& target_url, |
| 595 content::WebContents* new_contents) override; | 595 content::WebContents* new_contents) override; |
| 596 void RendererUnresponsive(content::WebContents* source) override; | 596 void RendererUnresponsive(content::WebContents* source) override; |
| 597 void RendererResponsive(content::WebContents* source) override; | 597 void RendererResponsive(content::WebContents* source) override; |
| 598 void WorkerCrashed(content::WebContents* source) override; | 598 void WorkerCrashed(content::WebContents* source) override; |
| 599 void DidNavigateMainFramePostCommit( | 599 void DidNavigateMainFramePostCommit( |
| 600 content::WebContents* web_contents) override; | 600 content::WebContents* web_contents) override; |
| 601 void DidNavigateToPendingEntry(content::WebContents* web_contents) override; | |
| 602 content::JavaScriptDialogManager* GetJavaScriptDialogManager( | 601 content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
| 603 content::WebContents* source) override; | 602 content::WebContents* source) override; |
| 604 content::ColorChooser* OpenColorChooser( | 603 content::ColorChooser* OpenColorChooser( |
| 605 content::WebContents* web_contents, | 604 content::WebContents* web_contents, |
| 606 SkColor color, | 605 SkColor color, |
| 607 const std::vector<content::ColorSuggestion>& suggestions) override; | 606 const std::vector<content::ColorSuggestion>& suggestions) override; |
| 608 void RunFileChooser(content::WebContents* web_contents, | 607 void RunFileChooser(content::WebContents* web_contents, |
| 609 const content::FileChooserParams& params) override; | 608 const content::FileChooserParams& params) override; |
| 610 void EnumerateDirectory(content::WebContents* web_contents, | 609 void EnumerateDirectory(content::WebContents* web_contents, |
| 611 int request_id, | 610 int request_id, |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 970 // The following factory is used for chrome update coalescing. | 969 // The following factory is used for chrome update coalescing. |
| 971 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 970 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 972 | 971 |
| 973 // The following factory is used to close the frame at a later time. | 972 // The following factory is used to close the frame at a later time. |
| 974 base::WeakPtrFactory<Browser> weak_factory_; | 973 base::WeakPtrFactory<Browser> weak_factory_; |
| 975 | 974 |
| 976 DISALLOW_COPY_AND_ASSIGN(Browser); | 975 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 977 }; | 976 }; |
| 978 | 977 |
| 979 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 978 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |