| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 int tab_index, | 206 int tab_index, |
| 207 int selected_navigation, | 207 int selected_navigation, |
| 208 bool select); | 208 bool select); |
| 209 | 209 |
| 210 // Replaces the state of the currently selected tab with the session | 210 // Replaces the state of the currently selected tab with the session |
| 211 // history restored from the SessionRestore system. | 211 // history restored from the SessionRestore system. |
| 212 void ReplaceRestoredTab( | 212 void ReplaceRestoredTab( |
| 213 const std::vector<TabNavigation>& navigations, | 213 const std::vector<TabNavigation>& navigations, |
| 214 int selected_navigation); | 214 int selected_navigation); |
| 215 | 215 |
| 216 // Show a native UI tab given a URL. If a tab with the same URL is already | 216 // Show a DOMUI tab given a URL. If a tab with the same URL is already |
| 217 // visible in this browser, it becomes selected. Otherwise a new tab is | 217 // visible in this browser, it becomes selected. Otherwise a new tab is |
| 218 // created. | 218 // created. |
| 219 void ShowNativeUITab(const GURL& url); | 219 void ShowSingleDOMUITab(const GURL& url); |
| 220 | 220 |
| 221 // Assorted browser commands //////////////////////////////////////////////// | 221 // Assorted browser commands //////////////////////////////////////////////// |
| 222 | 222 |
| 223 // NOTE: Within each of the following sections, the IDs are ordered roughly by | 223 // NOTE: Within each of the following sections, the IDs are ordered roughly by |
| 224 // how they appear in the GUI/menus (left to right, top to bottom, etc.). | 224 // how they appear in the GUI/menus (left to right, top to bottom, etc.). |
| 225 | 225 |
| 226 // Navigation commands | 226 // Navigation commands |
| 227 void GoBack(); | 227 void GoBack(); |
| 228 void GoForward(); | 228 void GoForward(); |
| 229 void Reload(); | 229 void Reload(); |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 // The browser idle task helps cleanup unused memory resources when idle. | 636 // The browser idle task helps cleanup unused memory resources when idle. |
| 637 scoped_ptr<BrowserIdleTimer> idle_task_; | 637 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 638 | 638 |
| 639 // Keep track of the encoding auto detect pref. | 639 // Keep track of the encoding auto detect pref. |
| 640 BooleanPrefMember encoding_auto_detect_; | 640 BooleanPrefMember encoding_auto_detect_; |
| 641 | 641 |
| 642 DISALLOW_COPY_AND_ASSIGN(Browser); | 642 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 643 }; | 643 }; |
| 644 | 644 |
| 645 #endif // CHROME_BROWSER_BROWSER_H_ | 645 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |