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