Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Side by Side Diff: chrome/browser/ui/chrome_pages.cc

Issue 722703002: Make "source" a required argument of AppLaunchParams and fill in the argument in all call points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
32 #include "ui/base/window_open_disposition.h"
30 33
31 #if defined(OS_WIN) 34 #if defined(OS_WIN)
32 #include "chrome/browser/enumerate_modules_model_win.h" 35 #include "chrome/browser/enumerate_modules_model_win.h"
33 #endif 36 #endif
34 37
35 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
36 #include "chrome/browser/chromeos/genius_app/app_id.h" 39 #include "chrome/browser/chromeos/genius_app/app_id.h"
37 #include "extensions/browser/extension_registry.h" 40 #include "extensions/browser/extension_registry.h"
38 #endif 41 #endif
39 42
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 void ShowHelpImpl(Browser* browser, 78 void ShowHelpImpl(Browser* browser,
76 Profile* profile, 79 Profile* profile,
77 HostDesktopType host_desktop_type, 80 HostDesktopType host_desktop_type,
78 HelpSource source) { 81 HelpSource source) {
79 content::RecordAction(UserMetricsAction("ShowHelpTab")); 82 content::RecordAction(UserMetricsAction("ShowHelpTab"));
80 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD) 83 #if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
81 const extensions::Extension* extension = 84 const extensions::Extension* extension =
82 extensions::ExtensionRegistry::Get(profile)->GetExtensionById( 85 extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
83 genius_app::kGeniusAppId, 86 genius_app::kGeniusAppId,
84 extensions::ExtensionRegistry::EVERYTHING); 87 extensions::ExtensionRegistry::EVERYTHING);
85 AppLaunchParams params(profile, extension, 0, host_desktop_type); 88 extensions::AppLaunchSource app_launch_source(extensions::SOURCE_UNTRACKED);
86 switch (source) { 89 switch (source) {
87 case HELP_SOURCE_KEYBOARD: 90 case HELP_SOURCE_KEYBOARD:
88 params.source = extensions::SOURCE_KEYBOARD; 91 app_launch_source = extensions::SOURCE_KEYBOARD;
89 break; 92 break;
90 case HELP_SOURCE_MENU: 93 case HELP_SOURCE_MENU:
91 params.source = extensions::SOURCE_SYSTEM_TRAY; 94 app_launch_source = extensions::SOURCE_SYSTEM_TRAY;
92 break; 95 break;
93 case HELP_SOURCE_WEBUI: 96 case HELP_SOURCE_WEBUI:
94 params.source = extensions::SOURCE_ABOUT_PAGE; 97 app_launch_source = extensions::SOURCE_ABOUT_PAGE;
95 break; 98 break;
99 default:
100 NOTREACHED() << "Unhandled help source" << source;
96 } 101 }
102 AppLaunchParams params(profile, extension, CURRENT_TAB, host_desktop_type,
103 app_launch_source);
97 OpenApplication(params); 104 OpenApplication(params);
98 #else 105 #else
99 GURL url; 106 GURL url;
100 switch (source) { 107 switch (source) {
101 case HELP_SOURCE_KEYBOARD: 108 case HELP_SOURCE_KEYBOARD:
102 url = GURL(kChromeHelpViaKeyboardURL); 109 url = GURL(kChromeHelpViaKeyboardURL);
103 break; 110 break;
104 case HELP_SOURCE_MENU: 111 case HELP_SOURCE_MENU:
105 url = GURL(kChromeHelpViaMenuURL); 112 url = GURL(kChromeHelpViaMenuURL);
106 break; 113 break;
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 browser = displayer->browser(); 347 browser = displayer->browser();
341 } 348 }
342 349
343 NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false))); 350 NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false)));
344 DCHECK_GT(browser->tab_strip_model()->count(), 0); 351 DCHECK_GT(browser->tab_strip_model()->count(), 0);
345 } 352 }
346 } 353 }
347 #endif 354 #endif
348 355
349 } // namespace chrome 356 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698