| 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_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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 bool from_last_session, | 395 bool from_last_session, |
| 396 const std::string& extension_app_id, | 396 const std::string& extension_app_id, |
| 397 SessionStorageNamespace* session_storage_namespace); | 397 SessionStorageNamespace* session_storage_namespace); |
| 398 | 398 |
| 399 // Navigate to an index in the tab history, opening a new tab depending on the | 399 // Navigate to an index in the tab history, opening a new tab depending on the |
| 400 // disposition. | 400 // disposition. |
| 401 bool NavigateToIndexWithDisposition(int index, WindowOpenDisposition disp); | 401 bool NavigateToIndexWithDisposition(int index, WindowOpenDisposition disp); |
| 402 | 402 |
| 403 // Show a given a URL. If a tab with the same URL (ignoring the ref) is | 403 // Show a given a URL. If a tab with the same URL (ignoring the ref) is |
| 404 // already visible in this browser, it becomes selected. Otherwise a new tab | 404 // already visible in this browser, it becomes selected. Otherwise a new tab |
| 405 // is created. | 405 // is created. If |ignore_path| is true, the paths of the URLs are ignored |
| 406 void ShowSingletonTab(const GURL& url); | 406 // when locating the singleton tab. |
| 407 void ShowSingletonTab(const GURL& url, bool ignore_path); |
| 407 | 408 |
| 408 // Update commands whose state depends on whether the window is in fullscreen | 409 // Update commands whose state depends on whether the window is in fullscreen |
| 409 // mode. This is a public function because on Linux, fullscreen mode is an | 410 // mode. This is a public function because on Linux, fullscreen mode is an |
| 410 // async call to X. Once we get the fullscreen callback, the browser window | 411 // async call to X. Once we get the fullscreen callback, the browser window |
| 411 // will call this method. | 412 // will call this method. |
| 412 void UpdateCommandsForFullscreenMode(bool is_fullscreen); | 413 void UpdateCommandsForFullscreenMode(bool is_fullscreen); |
| 413 | 414 |
| 414 // Assorted browser commands //////////////////////////////////////////////// | 415 // Assorted browser commands //////////////////////////////////////////////// |
| 415 | 416 |
| 416 // NOTE: Within each of the following sections, the IDs are ordered roughly by | 417 // NOTE: Within each of the following sections, the IDs are ordered roughly by |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1085 // The profile's tab restore service. The service is owned by the profile, | 1086 // The profile's tab restore service. The service is owned by the profile, |
| 1086 // and we install ourselves as an observer. | 1087 // and we install ourselves as an observer. |
| 1087 TabRestoreService* tab_restore_service_; | 1088 TabRestoreService* tab_restore_service_; |
| 1088 | 1089 |
| 1089 scoped_ptr<InstantController> instant_; | 1090 scoped_ptr<InstantController> instant_; |
| 1090 | 1091 |
| 1091 DISALLOW_COPY_AND_ASSIGN(Browser); | 1092 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1092 }; | 1093 }; |
| 1093 | 1094 |
| 1094 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1095 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |