| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 break; | 97 break; |
| 98 case HELP_SOURCE_MENU: | 98 case HELP_SOURCE_MENU: |
| 99 app_launch_source = extensions::SOURCE_SYSTEM_TRAY; | 99 app_launch_source = extensions::SOURCE_SYSTEM_TRAY; |
| 100 break; | 100 break; |
| 101 case HELP_SOURCE_WEBUI: | 101 case HELP_SOURCE_WEBUI: |
| 102 app_launch_source = extensions::SOURCE_ABOUT_PAGE; | 102 app_launch_source = extensions::SOURCE_ABOUT_PAGE; |
| 103 break; | 103 break; |
| 104 default: | 104 default: |
| 105 NOTREACHED() << "Unhandled help source" << source; | 105 NOTREACHED() << "Unhandled help source" << source; |
| 106 } | 106 } |
| 107 AppLaunchParams params(profile, extension, CURRENT_TAB, host_desktop_type, | 107 OpenApplication(CreateAppLaunchParamsUserContainer( |
| 108 app_launch_source); | 108 profile, extension, NEW_FOREGROUND_TAB, app_launch_source)); |
| 109 OpenApplication(params); | |
| 110 #else | 109 #else |
| 111 GURL url; | 110 GURL url; |
| 112 switch (source) { | 111 switch (source) { |
| 113 case HELP_SOURCE_KEYBOARD: | 112 case HELP_SOURCE_KEYBOARD: |
| 114 url = GURL(kChromeHelpViaKeyboardURL); | 113 url = GURL(kChromeHelpViaKeyboardURL); |
| 115 break; | 114 break; |
| 116 case HELP_SOURCE_MENU: | 115 case HELP_SOURCE_MENU: |
| 117 url = GURL(kChromeHelpViaMenuURL); | 116 url = GURL(kChromeHelpViaMenuURL); |
| 118 break; | 117 break; |
| 119 case HELP_SOURCE_WEBUI: | 118 case HELP_SOURCE_WEBUI: |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 SigninManagerFactory::GetForProfile(original_profile); | 402 SigninManagerFactory::GetForProfile(original_profile); |
| 404 DCHECK(manager->IsSigninAllowed()); | 403 DCHECK(manager->IsSigninAllowed()); |
| 405 if (manager->IsAuthenticated()) | 404 if (manager->IsAuthenticated()) |
| 406 ShowSettings(browser); | 405 ShowSettings(browser); |
| 407 else | 406 else |
| 408 ShowBrowserSignin(browser, access_point); | 407 ShowBrowserSignin(browser, access_point); |
| 409 } | 408 } |
| 410 #endif | 409 #endif |
| 411 | 410 |
| 412 } // namespace chrome | 411 } // namespace chrome |
| OLD | NEW |