Chromium Code Reviews| 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 const content::FileChooserParams& params) override; | 606 const content::FileChooserParams& params) override; |
| 607 void EnumerateDirectory(content::WebContents* web_contents, | 607 void EnumerateDirectory(content::WebContents* web_contents, |
| 608 int request_id, | 608 int request_id, |
| 609 const base::FilePath& path) override; | 609 const base::FilePath& path) override; |
| 610 bool EmbedsFullscreenWidget() const override; | 610 bool EmbedsFullscreenWidget() const override; |
| 611 void EnterFullscreenModeForTab(content::WebContents* web_contents, | 611 void EnterFullscreenModeForTab(content::WebContents* web_contents, |
| 612 const GURL& origin) override; | 612 const GURL& origin) override; |
| 613 void ExitFullscreenModeForTab(content::WebContents* web_contents) override; | 613 void ExitFullscreenModeForTab(content::WebContents* web_contents) override; |
| 614 bool IsFullscreenForTabOrPending( | 614 bool IsFullscreenForTabOrPending( |
| 615 const content::WebContents* web_contents) const override; | 615 const content::WebContents* web_contents) const override; |
| 616 | |
| 617 blink::WebDisplayMode GetDisplayMode( | |
|
sky
2015/08/31 15:57:27
Generally we want a block of overrides like this (
Mikhail
2015/09/01 08:13:46
Done.
| |
| 618 const content::WebContents* web_contents) const override; | |
| 619 | |
| 616 void RegisterProtocolHandler(content::WebContents* web_contents, | 620 void RegisterProtocolHandler(content::WebContents* web_contents, |
| 617 const std::string& protocol, | 621 const std::string& protocol, |
| 618 const GURL& url, | 622 const GURL& url, |
| 619 bool user_gesture) override; | 623 bool user_gesture) override; |
| 620 void UnregisterProtocolHandler(content::WebContents* web_contents, | 624 void UnregisterProtocolHandler(content::WebContents* web_contents, |
| 621 const std::string& protocol, | 625 const std::string& protocol, |
| 622 const GURL& url, | 626 const GURL& url, |
| 623 bool user_gesture) override; | 627 bool user_gesture) override; |
| 624 void UpdatePreferredSize(content::WebContents* source, | 628 void UpdatePreferredSize(content::WebContents* source, |
| 625 const gfx::Size& pref_size) override; | 629 const gfx::Size& pref_size) override; |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 972 // The following factory is used for chrome update coalescing. | 976 // The following factory is used for chrome update coalescing. |
| 973 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 977 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 974 | 978 |
| 975 // The following factory is used to close the frame at a later time. | 979 // The following factory is used to close the frame at a later time. |
| 976 base::WeakPtrFactory<Browser> weak_factory_; | 980 base::WeakPtrFactory<Browser> weak_factory_; |
| 977 | 981 |
| 978 DISALLOW_COPY_AND_ASSIGN(Browser); | 982 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 979 }; | 983 }; |
| 980 | 984 |
| 981 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 985 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |