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

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

Issue 1707773002: Revert of Remove HostDesktopType from AppLaunchParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-15
Patch Set: rebase Created 4 years, 10 months 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_common.cc ('k') | chrome/browser/ui/chrome_pages.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_UI_CHROME_PAGES_H_ 5 #ifndef CHROME_BROWSER_UI_CHROME_PAGES_H_
6 #define CHROME_BROWSER_UI_CHROME_PAGES_H_ 6 #define CHROME_BROWSER_UI_CHROME_PAGES_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/ui/host_desktop.h"
13 #include "components/content_settings/core/common/content_settings_types.h" 14 #include "components/content_settings/core/common/content_settings_types.h"
14 #include "url/gurl.h" 15 #include "url/gurl.h"
15 16
16 #if !defined(OS_ANDROID) && !defined(OS_IOS) 17 #if !defined(OS_ANDROID) && !defined(OS_IOS)
17 #include "chrome/browser/signin/signin_promo.h" 18 #include "chrome/browser/signin/signin_promo.h"
18 #endif 19 #endif
19 20
20 class Browser; 21 class Browser;
21 22
22 namespace content { 23 namespace content {
(...skipping 24 matching lines...) Expand all
47 void ShowConflicts(Browser* browser); 48 void ShowConflicts(Browser* browser);
48 49
49 // ShowFeedbackPage() uses |browser| to determine the URL of the current tab. 50 // ShowFeedbackPage() uses |browser| to determine the URL of the current tab.
50 // |browser| should be NULL if there are no currently open browser windows. 51 // |browser| should be NULL if there are no currently open browser windows.
51 void ShowFeedbackPage(Browser* browser, 52 void ShowFeedbackPage(Browser* browser,
52 const std::string& description_template, 53 const std::string& description_template,
53 const std::string& category_tag); 54 const std::string& category_tag);
54 55
55 void ShowHelp(Browser* browser, HelpSource source); 56 void ShowHelp(Browser* browser, HelpSource source);
56 void ShowHelpForProfile(Profile* profile, 57 void ShowHelpForProfile(Profile* profile,
58 HostDesktopType host_desktop_type,
57 HelpSource source); 59 HelpSource source);
58 void ShowPolicy(Browser* browser); 60 void ShowPolicy(Browser* browser);
59 void ShowSlow(Browser* browser); 61 void ShowSlow(Browser* browser);
60 void ShowMemory(Browser* browser); 62 void ShowMemory(Browser* browser);
61 63
62 // Constructs a settings GURL for the specified |sub_page|. 64 // Constructs a settings GURL for the specified |sub_page|.
63 GURL GetSettingsUrl(const std::string& sub_page); 65 GURL GetSettingsUrl(const std::string& sub_page);
64 66
65 // Returns true if |url| is the URL for the settings subpage |sub_page|. 67 // Returns true if |url| is the URL for the settings subpage |sub_page|.
66 bool IsSettingsSubPage(const GURL& url, const std::string& sub_page); 68 bool IsSettingsSubPage(const GURL& url, const std::string& sub_page);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 100
99 // If the user is already signed in, shows the "Signin" portion of Settings, 101 // If the user is already signed in, shows the "Signin" portion of Settings,
100 // otherwise initiates signin in a new browser tab. 102 // otherwise initiates signin in a new browser tab.
101 void ShowBrowserSigninOrSettings(Browser* browser, 103 void ShowBrowserSigninOrSettings(Browser* browser,
102 signin_metrics::AccessPoint access_point); 104 signin_metrics::AccessPoint access_point);
103 #endif 105 #endif
104 106
105 } // namespace chrome 107 } // namespace chrome
106 108
107 #endif // CHROME_BROWSER_UI_CHROME_PAGES_H_ 109 #endif // CHROME_BROWSER_UI_CHROME_PAGES_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_common.cc ('k') | chrome/browser/ui/chrome_pages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698