| 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_CHROME_PAGES_H_ | 5 #ifndef CHROME_BROWSER_UI_CHROME_PAGES_H_ |
| 6 #define CHROME_BROWSER_UI_CHROME_PAGES_H_ | 6 #define CHROME_BROWSER_UI_CHROME_PAGES_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "chrome/browser/ui/host_desktop.h" | |
| 11 #include "components/content_settings/core/common/content_settings_types.h" | 10 #include "components/content_settings/core/common/content_settings_types.h" |
| 11 #include "ui/gfx/host_desktop_type.h" |
| 12 #include "url/gurl.h" | 12 #include "url/gurl.h" |
| 13 | 13 |
| 14 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 14 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 15 #include "chrome/browser/signin/signin_promo.h" | 15 #include "chrome/browser/signin/signin_promo.h" |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 class Browser; | 18 class Browser; |
| 19 | 19 |
| 20 namespace content { | 20 namespace content { |
| 21 class WebContents; | 21 class WebContents; |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 // If the user is already signed in, shows the "Signin" portion of Settings, | 94 // If the user is already signed in, shows the "Signin" portion of Settings, |
| 95 // otherwise initiates signin in a new browser tab. | 95 // otherwise initiates signin in a new browser tab. |
| 96 void ShowBrowserSigninOrSettings(Browser* browser, | 96 void ShowBrowserSigninOrSettings(Browser* browser, |
| 97 signin_metrics::Source source); | 97 signin_metrics::Source source); |
| 98 #endif | 98 #endif |
| 99 | 99 |
| 100 } // namespace chrome | 100 } // namespace chrome |
| 101 | 101 |
| 102 #endif // CHROME_BROWSER_UI_CHROME_PAGES_H_ | 102 #endif // CHROME_BROWSER_UI_CHROME_PAGES_H_ |
| OLD | NEW |