OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 // Overridden from CommandUpdater::CommandUpdaterDelegate: | 407 // Overridden from CommandUpdater::CommandUpdaterDelegate: |
408 virtual void ExecuteCommand(int id); | 408 virtual void ExecuteCommand(int id); |
409 | 409 |
410 private: | 410 private: |
411 // Overridden from TabStripModelDelegate: | 411 // Overridden from TabStripModelDelegate: |
412 virtual TabContents* AddBlankTab(bool foreground); | 412 virtual TabContents* AddBlankTab(bool foreground); |
413 virtual TabContents* AddBlankTabAt(int index, bool foreground); | 413 virtual TabContents* AddBlankTabAt(int index, bool foreground); |
414 virtual Browser* CreateNewStripWithContents(TabContents* detached_contents, | 414 virtual Browser* CreateNewStripWithContents(TabContents* detached_contents, |
415 const gfx::Rect& window_bounds, | 415 const gfx::Rect& window_bounds, |
416 const DockInfo& dock_info); | 416 const DockInfo& dock_info); |
| 417 virtual void ContinueDraggingDetachedTab(TabContents* contents, |
| 418 const gfx::Rect& window_bounds, |
| 419 const gfx::Rect& tab_bounds); |
417 virtual int GetDragActions() const; | 420 virtual int GetDragActions() const; |
418 // Construct a TabContents for a given URL, profile and transition type. | 421 // Construct a TabContents for a given URL, profile and transition type. |
419 // If instance is not null, its process will be used to render the tab. | 422 // If instance is not null, its process will be used to render the tab. |
420 virtual TabContents* CreateTabContentsForURL(const GURL& url, | 423 virtual TabContents* CreateTabContentsForURL(const GURL& url, |
421 const GURL& referrer, | 424 const GURL& referrer, |
422 Profile* profile, | 425 Profile* profile, |
423 PageTransition::Type transition, | 426 PageTransition::Type transition, |
424 bool defer_load, | 427 bool defer_load, |
425 SiteInstance* instance) const; | 428 SiteInstance* instance) const; |
426 virtual bool CanDuplicateContentsAt(int index); | 429 virtual bool CanDuplicateContentsAt(int index); |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
747 // The browser idle task helps cleanup unused memory resources when idle. | 750 // The browser idle task helps cleanup unused memory resources when idle. |
748 scoped_ptr<BrowserIdleTimer> idle_task_; | 751 scoped_ptr<BrowserIdleTimer> idle_task_; |
749 | 752 |
750 // Keep track of the encoding auto detect pref. | 753 // Keep track of the encoding auto detect pref. |
751 BooleanPrefMember encoding_auto_detect_; | 754 BooleanPrefMember encoding_auto_detect_; |
752 | 755 |
753 DISALLOW_COPY_AND_ASSIGN(Browser); | 756 DISALLOW_COPY_AND_ASSIGN(Browser); |
754 }; | 757 }; |
755 | 758 |
756 #endif // CHROME_BROWSER_BROWSER_H_ | 759 #endif // CHROME_BROWSER_BROWSER_H_ |
OLD | NEW |