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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 | 442 |
443 // Navigate to an index in the tab history, opening a new tab depending on the | 443 // Navigate to an index in the tab history, opening a new tab depending on the |
444 // disposition. | 444 // disposition. |
445 bool NavigateToIndexWithDisposition(int index, WindowOpenDisposition disp); | 445 bool NavigateToIndexWithDisposition(int index, WindowOpenDisposition disp); |
446 | 446 |
447 // Show a given a URL. If a tab with the same URL (ignoring the ref) is | 447 // Show a given a URL. If a tab with the same URL (ignoring the ref) is |
448 // already visible in this browser, it becomes selected. Otherwise a new tab | 448 // already visible in this browser, it becomes selected. Otherwise a new tab |
449 // is created. | 449 // is created. |
450 void ShowSingletonTab(const GURL& url); | 450 void ShowSingletonTab(const GURL& url); |
451 | 451 |
| 452 // Same as ShowSingletonTab, but does not ignore ref. |
| 453 void ShowSingletonTabRespectRef(const GURL& url); |
| 454 |
452 // As ShowSingletonTab, but if the current tab is the new tab page or | 455 // As ShowSingletonTab, but if the current tab is the new tab page or |
453 // about:blank, then overwrite it with the passed contents. | 456 // about:blank, then overwrite it with the passed contents. |
454 void ShowSingletonTabOverwritingNTP(const browser::NavigateParams& params); | 457 void ShowSingletonTabOverwritingNTP(const browser::NavigateParams& params); |
455 | 458 |
456 // Creates a NavigateParams struct for a singleton tab navigation. | 459 // Creates a NavigateParams struct for a singleton tab navigation. |
457 browser::NavigateParams GetSingletonTabNavigateParams(const GURL& url); | 460 browser::NavigateParams GetSingletonTabNavigateParams(const GURL& url); |
458 | 461 |
459 // Invoked when the fullscreen state of the window changes. | 462 // Invoked when the fullscreen state of the window changes. |
460 // BrowserWindow::SetFullscreen invokes this after the window has become | 463 // BrowserWindow::SetFullscreen invokes this after the window has become |
461 // fullscreen. | 464 // fullscreen. |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 | 1279 |
1277 scoped_ptr<InstantController> instant_; | 1280 scoped_ptr<InstantController> instant_; |
1278 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1281 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1279 | 1282 |
1280 BookmarkBar::State bookmark_bar_state_; | 1283 BookmarkBar::State bookmark_bar_state_; |
1281 | 1284 |
1282 DISALLOW_COPY_AND_ASSIGN(Browser); | 1285 DISALLOW_COPY_AND_ASSIGN(Browser); |
1283 }; | 1286 }; |
1284 | 1287 |
1285 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1288 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |