| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 return; | 195 return; |
| 196 } | 196 } |
| 197 } | 197 } |
| 198 #endif | 198 #endif |
| 199 | 199 |
| 200 content::RecordAction(UserMetricsAction("AboutConflicts")); | 200 content::RecordAction(UserMetricsAction("AboutConflicts")); |
| 201 ShowSingletonTab(browser, GURL(kChromeUIConflictsURL)); | 201 ShowSingletonTab(browser, GURL(kChromeUIConflictsURL)); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void ShowHelp(Browser* browser, HelpSource source) { | 204 void ShowHelp(Browser* browser, HelpSource source) { |
| 205 ShowHelpImpl( | 205 ShowHelpImpl(browser, browser->profile(), HOST_DESKTOP_TYPE_NATIVE, source); |
| 206 browser, browser->profile(), browser->host_desktop_type(), source); | |
| 207 } | 206 } |
| 208 | 207 |
| 209 void ShowHelpForProfile(Profile* profile, | 208 void ShowHelpForProfile(Profile* profile, |
| 210 HostDesktopType host_desktop_type, | 209 HostDesktopType host_desktop_type, |
| 211 HelpSource source) { | 210 HelpSource source) { |
| 212 ShowHelpImpl(NULL, profile, host_desktop_type, source); | 211 ShowHelpImpl(NULL, profile, host_desktop_type, source); |
| 213 } | 212 } |
| 214 | 213 |
| 215 void ShowPolicy(Browser* browser) { | 214 void ShowPolicy(Browser* browser) { |
| 216 ShowSingletonTab(browser, GURL(kChromeUIPolicyURL)); | 215 ShowSingletonTab(browser, GURL(kChromeUIPolicyURL)); |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 SigninManagerFactory::GetForProfile(original_profile); | 403 SigninManagerFactory::GetForProfile(original_profile); |
| 405 DCHECK(manager->IsSigninAllowed()); | 404 DCHECK(manager->IsSigninAllowed()); |
| 406 if (manager->IsAuthenticated()) | 405 if (manager->IsAuthenticated()) |
| 407 ShowSettings(browser); | 406 ShowSettings(browser); |
| 408 else | 407 else |
| 409 ShowBrowserSignin(browser, access_point); | 408 ShowBrowserSignin(browser, access_point); |
| 410 } | 409 } |
| 411 #endif | 410 #endif |
| 412 | 411 |
| 413 } // namespace chrome | 412 } // namespace chrome |
| OLD | NEW |