OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_BROWSER_H_ |
6 #define CHROME_BROWSER_BROWSER_H_ | 6 #define CHROME_BROWSER_BROWSER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 void OpenBugReportDialog(); | 503 void OpenBugReportDialog(); |
504 | 504 |
505 void ToggleBookmarkBar(); | 505 void ToggleBookmarkBar(); |
506 | 506 |
507 void OpenBookmarkManager(); | 507 void OpenBookmarkManager(); |
508 void ShowAppMenu(); | 508 void ShowAppMenu(); |
509 void ShowBookmarkManagerTab(); | 509 void ShowBookmarkManagerTab(); |
510 void ShowHistoryTab(); | 510 void ShowHistoryTab(); |
511 void ShowDownloadsTab(); | 511 void ShowDownloadsTab(); |
512 void ShowExtensionsTab(); | 512 void ShowExtensionsTab(); |
| 513 void ShowAboutConflictsTab(); |
513 void ShowBrokenPageTab(TabContents* contents); | 514 void ShowBrokenPageTab(TabContents* contents); |
514 void ShowOptionsTab(const std::string& sub_page); | 515 void ShowOptionsTab(const std::string& sub_page); |
515 void OpenClearBrowsingDataDialog(); | 516 void OpenClearBrowsingDataDialog(); |
516 void OpenOptionsDialog(); | 517 void OpenOptionsDialog(); |
517 void OpenKeywordEditor(); | 518 void OpenKeywordEditor(); |
518 void OpenPasswordManager(); | 519 void OpenPasswordManager(); |
519 void OpenSyncMyBookmarksDialog(); | 520 void OpenSyncMyBookmarksDialog(); |
520 #if defined(ENABLE_REMOTING) | 521 #if defined(ENABLE_REMOTING) |
521 void OpenRemotingSetupDialog(); | 522 void OpenRemotingSetupDialog(); |
522 #endif | 523 #endif |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1084 // The profile's tab restore service. The service is owned by the profile, | 1085 // The profile's tab restore service. The service is owned by the profile, |
1085 // and we install ourselves as an observer. | 1086 // and we install ourselves as an observer. |
1086 TabRestoreService* tab_restore_service_; | 1087 TabRestoreService* tab_restore_service_; |
1087 | 1088 |
1088 scoped_ptr<InstantController> instant_; | 1089 scoped_ptr<InstantController> instant_; |
1089 | 1090 |
1090 DISALLOW_COPY_AND_ASSIGN(Browser); | 1091 DISALLOW_COPY_AND_ASSIGN(Browser); |
1091 }; | 1092 }; |
1092 | 1093 |
1093 #endif // CHROME_BROWSER_BROWSER_H_ | 1094 #endif // CHROME_BROWSER_BROWSER_H_ |
OLD | NEW |