| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 void OpenFile(); | 568 void OpenFile(); |
| 569 void OpenCreateShortcutsDialog(); | 569 void OpenCreateShortcutsDialog(); |
| 570 void ToggleDevToolsWindow(DevToolsToggleAction action); | 570 void ToggleDevToolsWindow(DevToolsToggleAction action); |
| 571 void OpenTaskManager(bool highlight_background_resources); | 571 void OpenTaskManager(bool highlight_background_resources); |
| 572 void OpenBugReportDialog(); | 572 void OpenBugReportDialog(); |
| 573 | 573 |
| 574 void ToggleBookmarkBar(); | 574 void ToggleBookmarkBar(); |
| 575 | 575 |
| 576 void OpenBookmarkManager(); | 576 void OpenBookmarkManager(); |
| 577 void OpenBookmarkManagerForNode(int64 node_id); | 577 void OpenBookmarkManagerForNode(int64 node_id); |
| 578 void OpenBookmarkManagerEditNode(int64 node_id); |
| 579 void OpenBookmarkManagerAddNodeIn(int64 node_id); |
| 578 void ShowAppMenu(); | 580 void ShowAppMenu(); |
| 579 void ShowHistoryTab(); | 581 void ShowHistoryTab(); |
| 580 void ShowDownloadsTab(); | 582 void ShowDownloadsTab(); |
| 581 void ShowExtensionsTab(); | 583 void ShowExtensionsTab(); |
| 582 void ShowAboutConflictsTab(); | 584 void ShowAboutConflictsTab(); |
| 583 void ShowBrokenPageTab(TabContents* contents); | 585 void ShowBrokenPageTab(TabContents* contents); |
| 584 void ShowOptionsTab(const std::string& sub_page); | 586 void ShowOptionsTab(const std::string& sub_page); |
| 585 // Shows the Content Settings page for a given content type. | 587 // Shows the Content Settings page for a given content type. |
| 586 void ShowContentSettingsPage(ContentSettingsType content_type); | 588 void ShowContentSettingsPage(ContentSettingsType content_type); |
| 587 void OpenClearBrowsingDataDialog(); | 589 void OpenClearBrowsingDataDialog(); |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1138 | 1140 |
| 1139 // Retrieves the content restrictions for the currently selected tab. | 1141 // Retrieves the content restrictions for the currently selected tab. |
| 1140 // Returns 0 if no tab selected, which is equivalent to no content | 1142 // Returns 0 if no tab selected, which is equivalent to no content |
| 1141 // restrictions active. | 1143 // restrictions active. |
| 1142 int GetContentRestrictionsForSelectedTab(); | 1144 int GetContentRestrictionsForSelectedTab(); |
| 1143 | 1145 |
| 1144 // Resets |bookmark_bar_state_| based on the active tab. Notifies the | 1146 // Resets |bookmark_bar_state_| based on the active tab. Notifies the |
| 1145 // BrowserWindow if necessary. | 1147 // BrowserWindow if necessary. |
| 1146 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); | 1148 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); |
| 1147 | 1149 |
| 1150 // Open the bookmark manager with a defined hash action. |
| 1151 void OpenBookmarkManagerWithHash(const std::string& action, int64 node_id); |
| 1152 |
| 1148 // Data members ///////////////////////////////////////////////////////////// | 1153 // Data members ///////////////////////////////////////////////////////////// |
| 1149 | 1154 |
| 1150 NotificationRegistrar registrar_; | 1155 NotificationRegistrar registrar_; |
| 1151 | 1156 |
| 1152 PrefChangeRegistrar profile_pref_registrar_; | 1157 PrefChangeRegistrar profile_pref_registrar_; |
| 1153 | 1158 |
| 1154 PrefChangeRegistrar local_pref_registrar_; | 1159 PrefChangeRegistrar local_pref_registrar_; |
| 1155 | 1160 |
| 1156 // This Browser's type. | 1161 // This Browser's type. |
| 1157 const Type type_; | 1162 const Type type_; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 | 1289 |
| 1285 scoped_ptr<InstantController> instant_; | 1290 scoped_ptr<InstantController> instant_; |
| 1286 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1291 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1287 | 1292 |
| 1288 BookmarkBar::State bookmark_bar_state_; | 1293 BookmarkBar::State bookmark_bar_state_; |
| 1289 | 1294 |
| 1290 DISALLOW_COPY_AND_ASSIGN(Browser); | 1295 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1291 }; | 1296 }; |
| 1292 | 1297 |
| 1293 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1298 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |