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" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "chrome/browser/download/download_shelf.h" | 14 #include "chrome/browser/download/download_shelf.h" |
| 15 #include "chrome/browser/extensions/launch_util.h" |
15 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/browser_finder.h" | 19 #include "chrome/browser/ui/browser_finder.h" |
19 #include "chrome/browser/ui/browser_navigator_params.h" | 20 #include "chrome/browser/ui/browser_navigator_params.h" |
20 #include "chrome/browser/ui/browser_window.h" | 21 #include "chrome/browser/ui/browser_window.h" |
21 #include "chrome/browser/ui/extensions/app_launch_params.h" | 22 #include "chrome/browser/ui/extensions/app_launch_params.h" |
22 #include "chrome/browser/ui/extensions/application_launch.h" | 23 #include "chrome/browser/ui/extensions/application_launch.h" |
23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 24 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
24 #include "chrome/browser/ui/settings_window_manager.h" | 25 #include "chrome/browser/ui/settings_window_manager.h" |
25 #include "chrome/browser/ui/singleton_tabs.h" | 26 #include "chrome/browser/ui/singleton_tabs.h" |
26 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 27 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
27 #include "chrome/browser/ui/webui/options/content_settings_handler.h" | 28 #include "chrome/browser/ui/webui/options/content_settings_handler.h" |
28 #include "chrome/browser/ui/webui/site_settings_helper.h" | 29 #include "chrome/browser/ui/webui/site_settings_helper.h" |
29 #include "chrome/common/chrome_switches.h" | 30 #include "chrome/common/chrome_switches.h" |
30 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
31 #include "components/signin/core/browser/signin_header_helper.h" | 32 #include "components/signin/core/browser/signin_header_helper.h" |
32 #include "components/signin/core/common/profile_management_switches.h" | 33 #include "components/signin/core/common/profile_management_switches.h" |
33 #include "content/public/browser/user_metrics.h" | 34 #include "content/public/browser/user_metrics.h" |
34 #include "content/public/browser/web_contents.h" | 35 #include "content/public/browser/web_contents.h" |
| 36 #include "extensions/browser/extension_prefs.h" |
35 #include "extensions/common/constants.h" | 37 #include "extensions/common/constants.h" |
36 #include "google_apis/gaia/gaia_urls.h" | 38 #include "google_apis/gaia/gaia_urls.h" |
37 #include "net/base/url_util.h" | 39 #include "net/base/url_util.h" |
38 #include "ui/base/window_open_disposition.h" | 40 #include "ui/base/window_open_disposition.h" |
39 | 41 |
40 #if defined(OS_WIN) | 42 #if defined(OS_WIN) |
41 #include "chrome/browser/win/enumerate_modules_model.h" | 43 #include "chrome/browser/win/enumerate_modules_model.h" |
42 #endif | 44 #endif |
43 | 45 |
44 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 break; | 97 break; |
96 case HELP_SOURCE_MENU: | 98 case HELP_SOURCE_MENU: |
97 app_launch_source = extensions::SOURCE_SYSTEM_TRAY; | 99 app_launch_source = extensions::SOURCE_SYSTEM_TRAY; |
98 break; | 100 break; |
99 case HELP_SOURCE_WEBUI: | 101 case HELP_SOURCE_WEBUI: |
100 app_launch_source = extensions::SOURCE_ABOUT_PAGE; | 102 app_launch_source = extensions::SOURCE_ABOUT_PAGE; |
101 break; | 103 break; |
102 default: | 104 default: |
103 NOTREACHED() << "Unhandled help source" << source; | 105 NOTREACHED() << "Unhandled help source" << source; |
104 } | 106 } |
105 OpenApplication(CreateAppLaunchParamsUserContainer( | 107 OpenApplication( |
106 profile, extension, NEW_FOREGROUND_TAB, app_launch_source)); | 108 AppLaunchParams(profile, extension, |
| 109 extensions::GetLaunchContainer( |
| 110 extensions::ExtensionPrefs::Get(profile), extension), |
| 111 NEW_FOREGROUND_TAB, source, true)); |
107 #else | 112 #else |
108 GURL url; | 113 GURL url; |
109 switch (source) { | 114 switch (source) { |
110 case HELP_SOURCE_KEYBOARD: | 115 case HELP_SOURCE_KEYBOARD: |
111 url = GURL(kChromeHelpViaKeyboardURL); | 116 url = GURL(kChromeHelpViaKeyboardURL); |
112 break; | 117 break; |
113 case HELP_SOURCE_MENU: | 118 case HELP_SOURCE_MENU: |
114 url = GURL(kChromeHelpViaMenuURL); | 119 url = GURL(kChromeHelpViaMenuURL); |
115 break; | 120 break; |
116 case HELP_SOURCE_WEBUI: | 121 case HELP_SOURCE_WEBUI: |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 SigninManagerFactory::GetForProfile(original_profile); | 398 SigninManagerFactory::GetForProfile(original_profile); |
394 DCHECK(manager->IsSigninAllowed()); | 399 DCHECK(manager->IsSigninAllowed()); |
395 if (manager->IsAuthenticated()) | 400 if (manager->IsAuthenticated()) |
396 ShowSettings(browser); | 401 ShowSettings(browser); |
397 else | 402 else |
398 ShowBrowserSignin(browser, access_point); | 403 ShowBrowserSignin(browser, access_point); |
399 } | 404 } |
400 #endif | 405 #endif |
401 | 406 |
402 } // namespace chrome | 407 } // namespace chrome |
OLD | NEW |