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

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

Issue 10546072: Use different help URLs for menus, accelerators, and WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 6 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 | Annotate | Revision Log
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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 // The browser is shutting down and there are active downloads 152 // The browser is shutting down and there are active downloads
153 // that would be cancelled. 153 // that would be cancelled.
154 DOWNLOAD_CLOSE_BROWSER_SHUTDOWN, 154 DOWNLOAD_CLOSE_BROWSER_SHUTDOWN,
155 155
156 // There are active downloads associated with this incognito profile 156 // There are active downloads associated with this incognito profile
157 // that would be canceled. 157 // that would be canceled.
158 DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, 158 DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE,
159 }; 159 };
160 160
161 // Sources of requests to show the help tab.
162 enum HelpSource {
163 // Keyboard accelerators.
164 HELP_SOURCE_KEYBOARD,
165
166 // Menus (e.g. wrench menu or Chrome OS system menu).
167 HELP_SOURCE_MENU,
168
169 // WebUI (the "About" page).
170 HELP_SOURCE_WEBUI,
171 };
172
161 // Different types of action when web app info is available. 173 // Different types of action when web app info is available.
162 // OnDidGetApplicationInfo uses this to dispatch calls. 174 // OnDidGetApplicationInfo uses this to dispatch calls.
163 enum WebAppAction { 175 enum WebAppAction {
164 NONE, // No action at all. 176 NONE, // No action at all.
165 CREATE_SHORTCUT, // Bring up create application shortcut dialog. 177 CREATE_SHORTCUT, // Bring up create application shortcut dialog.
166 UPDATE_SHORTCUT // Update icon for app shortcut. 178 UPDATE_SHORTCUT // Update icon for app shortcut.
167 }; 179 };
168 180
169 struct CreateParams { 181 struct CreateParams {
170 CreateParams(); 182 CreateParams();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 319
308 // Opens a new window and opens the bookmark manager. 320 // Opens a new window and opens the bookmark manager.
309 static void OpenBookmarkManagerWindow(Profile* profile); 321 static void OpenBookmarkManagerWindow(Profile* profile);
310 322
311 #if defined(OS_MACOSX) 323 #if defined(OS_MACOSX)
312 // Open a new window with history/downloads/help/options (needed on Mac when 324 // Open a new window with history/downloads/help/options (needed on Mac when
313 // there are no windows). 325 // there are no windows).
314 static void OpenAboutWindow(Profile* profile); 326 static void OpenAboutWindow(Profile* profile);
315 static void OpenHistoryWindow(Profile* profile); 327 static void OpenHistoryWindow(Profile* profile);
316 static void OpenDownloadsWindow(Profile* profile); 328 static void OpenDownloadsWindow(Profile* profile);
317 static void OpenHelpWindow(Profile* profile); 329 static void OpenHelpWindow(Profile* profile, HelpSource source);
318 static void OpenOptionsWindow(Profile* profile); 330 static void OpenOptionsWindow(Profile* profile);
319 static void OpenSyncSetupWindow(Profile* profile, 331 static void OpenSyncSetupWindow(Profile* profile,
320 SyncPromoUI::Source source); 332 SyncPromoUI::Source source);
321 static void OpenClearBrowsingDataDialogWindow(Profile* profile); 333 static void OpenClearBrowsingDataDialogWindow(Profile* profile);
322 static void OpenImportSettingsDialogWindow(Profile* profile); 334 static void OpenImportSettingsDialogWindow(Profile* profile);
323 static void OpenInstantConfirmDialogWindow(Profile* profile); 335 static void OpenInstantConfirmDialogWindow(Profile* profile);
324 #endif 336 #endif
325 337
326 // Opens a window with the extensions tab in it - needed by long-lived 338 // Opens a window with the extensions tab in it - needed by long-lived
327 // extensions which may run with no windows open. 339 // extensions which may run with no windows open.
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 // Shows the Content Settings page for a given content type. 632 // Shows the Content Settings page for a given content type.
621 void ShowContentSettingsPage(ContentSettingsType content_type); 633 void ShowContentSettingsPage(ContentSettingsType content_type);
622 void OpenClearBrowsingDataDialog(); 634 void OpenClearBrowsingDataDialog();
623 void OpenOptionsDialog(); 635 void OpenOptionsDialog();
624 void OpenPasswordManager(); 636 void OpenPasswordManager();
625 void OpenSyncMyBookmarksDialog(); 637 void OpenSyncMyBookmarksDialog();
626 void OpenImportSettingsDialog(); 638 void OpenImportSettingsDialog();
627 void OpenInstantConfirmDialog(); 639 void OpenInstantConfirmDialog();
628 void OpenAboutChromeDialog(); 640 void OpenAboutChromeDialog();
629 void OpenUpdateChromeDialog(); 641 void OpenUpdateChromeDialog();
630 void ShowHelpTab(); 642 void ShowHelpTab(HelpSource source);
631 void OpenPrivacyDashboardTabAndActivate(); 643 void OpenPrivacyDashboardTabAndActivate();
632 void OpenSearchEngineOptionsDialog(); 644 void OpenSearchEngineOptionsDialog();
633 void OpenPluginsTabAndActivate(); 645 void OpenPluginsTabAndActivate();
634 void ShowSyncSetup(SyncPromoUI::Source source); 646 void ShowSyncSetup(SyncPromoUI::Source source);
635 void ToggleSpeechInput(); 647 void ToggleSpeechInput();
636 648
637 virtual void UpdateDownloadShelfVisibility(bool visible); 649 virtual void UpdateDownloadShelfVisibility(bool visible);
638 650
639 ///////////////////////////////////////////////////////////////////////////// 651 /////////////////////////////////////////////////////////////////////////////
640 652
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 bool window_has_shown_; 1441 bool window_has_shown_;
1430 1442
1431 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1443 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1432 // before DidEndColorChooser is called. 1444 // before DidEndColorChooser is called.
1433 scoped_ptr<content::ColorChooser> color_chooser_; 1445 scoped_ptr<content::ColorChooser> color_chooser_;
1434 1446
1435 DISALLOW_COPY_AND_ASSIGN(Browser); 1447 DISALLOW_COPY_AND_ASSIGN(Browser);
1436 }; 1448 };
1437 1449
1438 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1450 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698