| 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 #include "chrome/browser/ui/chrome_pages.h" | 5 #include "chrome/browser/ui/chrome_pages.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "components/signin/core/browser/signin_header_helper.h" | 31 #include "components/signin/core/browser/signin_header_helper.h" |
| 32 #include "components/signin/core/common/profile_management_switches.h" | 32 #include "components/signin/core/common/profile_management_switches.h" |
| 33 #include "content/public/browser/user_metrics.h" | 33 #include "content/public/browser/user_metrics.h" |
| 34 #include "content/public/browser/web_contents.h" | 34 #include "content/public/browser/web_contents.h" |
| 35 #include "extensions/common/constants.h" | 35 #include "extensions/common/constants.h" |
| 36 #include "google_apis/gaia/gaia_urls.h" | 36 #include "google_apis/gaia/gaia_urls.h" |
| 37 #include "net/base/url_util.h" | 37 #include "net/base/url_util.h" |
| 38 #include "ui/base/window_open_disposition.h" | 38 #include "ui/base/window_open_disposition.h" |
| 39 | 39 |
| 40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
| 41 #include "chrome/browser/enumerate_modules_model_win.h" | 41 #include "chrome/browser/win/enumerate_modules_model.h" |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 #if defined(OS_CHROMEOS) | 44 #if defined(OS_CHROMEOS) |
| 45 #include "chrome/browser/chromeos/genius_app/app_id.h" | 45 #include "chrome/browser/chromeos/genius_app/app_id.h" |
| 46 #include "extensions/browser/extension_registry.h" | 46 #include "extensions/browser/extension_registry.h" |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 #if !defined(OS_ANDROID) | 49 #if !defined(OS_ANDROID) |
| 50 #include "chrome/browser/signin/signin_manager_factory.h" | 50 #include "chrome/browser/signin/signin_manager_factory.h" |
| 51 #include "components/signin/core/browser/signin_manager.h" | 51 #include "components/signin/core/browser/signin_manager.h" |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 SigninManagerFactory::GetForProfile(original_profile); | 393 SigninManagerFactory::GetForProfile(original_profile); |
| 394 DCHECK(manager->IsSigninAllowed()); | 394 DCHECK(manager->IsSigninAllowed()); |
| 395 if (manager->IsAuthenticated()) | 395 if (manager->IsAuthenticated()) |
| 396 ShowSettings(browser); | 396 ShowSettings(browser); |
| 397 else | 397 else |
| 398 ShowBrowserSignin(browser, access_point); | 398 ShowBrowserSignin(browser, access_point); |
| 399 } | 399 } |
| 400 #endif | 400 #endif |
| 401 | 401 |
| 402 } // namespace chrome | 402 } // namespace chrome |
| OLD | NEW |