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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
11 #include "chrome/browser/download/download_shelf.h" | 11 #include "chrome/browser/download/download_shelf.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
16 #include "chrome/browser/ui/browser_navigator.h" | 16 #include "chrome/browser/ui/browser_navigator.h" |
17 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
18 #include "chrome/browser/ui/extensions/app_launch_params.h" | |
18 #include "chrome/browser/ui/extensions/application_launch.h" | 19 #include "chrome/browser/ui/extensions/application_launch.h" |
19 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 20 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
20 #include "chrome/browser/ui/settings_window_manager.h" | 21 #include "chrome/browser/ui/settings_window_manager.h" |
21 #include "chrome/browser/ui/singleton_tabs.h" | 22 #include "chrome/browser/ui/singleton_tabs.h" |
22 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 23 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
23 #include "chrome/browser/ui/webui/options/content_settings_handler.h" | 24 #include "chrome/browser/ui/webui/options/content_settings_handler.h" |
24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
26 #include "content/public/browser/user_metrics.h" | 27 #include "content/public/browser/user_metrics.h" |
27 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
29 #include "extensions/common/constants.h" | |
28 #include "google_apis/gaia/gaia_urls.h" | 30 #include "google_apis/gaia/gaia_urls.h" |
29 #include "net/base/url_util.h" | 31 #include "net/base/url_util.h" |
30 | 32 |
31 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
32 #include "chrome/browser/enumerate_modules_model_win.h" | 34 #include "chrome/browser/enumerate_modules_model_win.h" |
33 #endif | 35 #endif |
34 | 36 |
35 #if defined(OS_CHROMEOS) | 37 #if defined(OS_CHROMEOS) |
36 #include "chrome/browser/chromeos/genius_app/app_id.h" | 38 #include "chrome/browser/chromeos/genius_app/app_id.h" |
37 #include "extensions/browser/extension_registry.h" | 39 #include "extensions/browser/extension_registry.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
68 ShowSingletonTabOverwritingNTP(browser, params); | 70 ShowSingletonTabOverwritingNTP(browser, params); |
69 } | 71 } |
70 | 72 |
71 // Shows either the help app or the appropriate help page for |source|. If | 73 // Shows either the help app or the appropriate help page for |source|. If |
72 // |browser| is NULL and the help page is used (vs the app), the help page is | 74 // |browser| is NULL and the help page is used (vs the app), the help page is |
73 // shown in the last active browser. If there is no such browser, a new browser | 75 // shown in the last active browser. If there is no such browser, a new browser |
74 // is created. | 76 // is created. |
75 void ShowHelpImpl(Browser* browser, | 77 void ShowHelpImpl(Browser* browser, |
76 Profile* profile, | 78 Profile* profile, |
77 HostDesktopType host_desktop_type, | 79 HostDesktopType host_desktop_type, |
78 HelpSource source) { | 80 HelpSource help_source) { |
sky
2014/11/19 16:52:08
Change the declaration to match the new name, alth
cylee1
2014/11/19 17:51:17
Done.
| |
79 content::RecordAction(UserMetricsAction("ShowHelpTab")); | 81 content::RecordAction(UserMetricsAction("ShowHelpTab")); |
80 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD) | 82 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD) |
81 const extensions::Extension* extension = | 83 const extensions::Extension* extension = |
82 extensions::ExtensionRegistry::Get(profile)->GetExtensionById( | 84 extensions::ExtensionRegistry::Get(profile)->GetExtensionById( |
83 genius_app::kGeniusAppId, | 85 genius_app::kGeniusAppId, |
84 extensions::ExtensionRegistry::EVERYTHING); | 86 extensions::ExtensionRegistry::EVERYTHING); |
85 AppLaunchParams params(profile, extension, 0, host_desktop_type); | 87 extensions::AppLaunchSource source(extensions::SOURCE_UNTRACKED); |
86 switch (source) { | 88 switch (help_source) { |
87 case HELP_SOURCE_KEYBOARD: | 89 case HELP_SOURCE_KEYBOARD: |
88 params.source = extensions::SOURCE_KEYBOARD; | 90 source = extensions::SOURCE_KEYBOARD; |
89 break; | 91 break; |
90 case HELP_SOURCE_MENU: | 92 case HELP_SOURCE_MENU: |
91 params.source = extensions::SOURCE_SYSTEM_TRAY; | 93 source = extensions::SOURCE_SYSTEM_TRAY; |
92 break; | 94 break; |
93 case HELP_SOURCE_WEBUI: | 95 case HELP_SOURCE_WEBUI: |
94 params.source = extensions::SOURCE_ABOUT_PAGE; | 96 source = extensions::SOURCE_ABOUT_PAGE; |
95 break; | 97 break; |
98 default: | |
99 NOTREACHED() << "Unhandled help source " << help_source; | |
96 } | 100 } |
101 AppLaunchParams params(profile, extension, 0, host_desktop_type, source); | |
97 OpenApplication(params); | 102 OpenApplication(params); |
98 #else | 103 #else |
99 GURL url; | 104 GURL url; |
100 switch (source) { | 105 switch (help_source) { |
101 case HELP_SOURCE_KEYBOARD: | 106 case HELP_SOURCE_KEYBOARD: |
102 url = GURL(kChromeHelpViaKeyboardURL); | 107 url = GURL(kChromeHelpViaKeyboardURL); |
103 break; | 108 break; |
104 case HELP_SOURCE_MENU: | 109 case HELP_SOURCE_MENU: |
105 url = GURL(kChromeHelpViaMenuURL); | 110 url = GURL(kChromeHelpViaMenuURL); |
106 break; | 111 break; |
107 case HELP_SOURCE_WEBUI: | 112 case HELP_SOURCE_WEBUI: |
108 url = GURL(kChromeHelpViaWebUIURL); | 113 url = GURL(kChromeHelpViaWebUIURL); |
109 break; | 114 break; |
110 default: | 115 default: |
111 NOTREACHED() << "Unhandled help source " << source; | 116 NOTREACHED() << "Unhandled help source " << help_source; |
112 } | 117 } |
113 scoped_ptr<ScopedTabbedBrowserDisplayer> displayer; | 118 scoped_ptr<ScopedTabbedBrowserDisplayer> displayer; |
114 if (!browser) { | 119 if (!browser) { |
115 displayer.reset( | 120 displayer.reset( |
116 new ScopedTabbedBrowserDisplayer(profile, host_desktop_type)); | 121 new ScopedTabbedBrowserDisplayer(profile, host_desktop_type)); |
117 browser = displayer->browser(); | 122 browser = displayer->browser(); |
118 } | 123 } |
119 ShowSingletonTab(browser, url); | 124 ShowSingletonTab(browser, url); |
120 #endif | 125 #endif |
121 } | 126 } |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
340 browser = displayer->browser(); | 345 browser = displayer->browser(); |
341 } | 346 } |
342 | 347 |
343 NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false))); | 348 NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false))); |
344 DCHECK_GT(browser->tab_strip_model()->count(), 0); | 349 DCHECK_GT(browser->tab_strip_model()->count(), 0); |
345 } | 350 } |
346 } | 351 } |
347 #endif | 352 #endif |
348 | 353 |
349 } // namespace chrome | 354 } // namespace chrome |
OLD | NEW |