| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 class Browser : public TabStripModelDelegate, | 46 class Browser : public TabStripModelDelegate, |
| 47 public TabStripModelObserver, | 47 public TabStripModelObserver, |
| 48 public TabContentsDelegate, | 48 public TabContentsDelegate, |
| 49 public CommandUpdater::CommandUpdaterDelegate, | 49 public CommandUpdater::CommandUpdaterDelegate, |
| 50 public NotificationObserver, | 50 public NotificationObserver, |
| 51 public SelectFileDialog::Listener { | 51 public SelectFileDialog::Listener { |
| 52 public: | 52 public: |
| 53 enum Type { | 53 enum Type { |
| 54 TYPE_NORMAL = 0, | 54 TYPE_NORMAL = 0, |
| 55 TYPE_POPUP = 1, | 55 TYPE_POPUP = 1, |
| 56 TYPE_APP = 2 | 56 TYPE_APP = 2, |
| 57 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, |
| 57 }; | 58 }; |
| 58 | 59 |
| 59 // Constructors, Creation, Showing ////////////////////////////////////////// | 60 // Constructors, Creation, Showing ////////////////////////////////////////// |
| 60 | 61 |
| 61 // Creates a new browser of the given |type| and for the given |profile|. The | 62 // Creates a new browser of the given |type| and for the given |profile|. The |
| 62 // Browser has a NULL window after its construction, CreateBrowserWindow must | 63 // Browser has a NULL window after its construction, CreateBrowserWindow must |
| 63 // be called after configuration for window() to be valid. | 64 // be called after configuration for window() to be valid. |
| 64 Browser(Type type, Profile* profile); | 65 Browser(Type type, Profile* profile); |
| 65 ~Browser(); | 66 ~Browser(); |
| 66 | 67 |
| 67 // Creates a normal tabbed browser with the specified profile. The Browser's | 68 // Creates a normal tabbed browser with the specified profile. The Browser's |
| 68 // window is created by this function call. | 69 // window is created by this function call. |
| 69 static Browser* Create(Profile* profile); | 70 static Browser* Create(Profile* profile); |
| 70 | 71 |
| 71 // Like Create, but creates a tabstrip-less popup window. | 72 // Like Create, but creates a tabstrip-less popup window. |
| 72 static Browser* CreateForPopup(Profile* profile); | 73 static Browser* CreateForPopup(Profile* profile); |
| 73 | 74 |
| 74 // Like Create, but creates a tabstrip-less and toolbar-less "app" window for | 75 // Like Create, but creates a tabstrip-less and toolbar-less "app" window for |
| 75 // the specified app. | 76 // the specified app. Passing popup=true will create a TYPE_APP_POPUP browser |
| 76 static Browser* CreateForApp(const std::wstring& app_name, Profile* profile); | 77 static Browser* CreateForApp(const std::wstring& app_name, Profile* profile, |
| 78 bool is_popup); |
| 77 | 79 |
| 78 // Set overrides for the initial window bounds and maximized state. | 80 // Set overrides for the initial window bounds and maximized state. |
| 79 void set_override_bounds(const gfx::Rect& bounds) { | 81 void set_override_bounds(const gfx::Rect& bounds) { |
| 80 override_bounds_ = bounds; | 82 override_bounds_ = bounds; |
| 81 } | 83 } |
| 82 void set_override_maximized(bool maximized) { | 84 void set_override_maximized(bool maximized) { |
| 83 override_maximized_ = maximized; | 85 override_maximized_ = maximized; |
| 84 } | 86 } |
| 85 | 87 |
| 86 // Creates the Browser Window. Prefer to use the static helpers above where | 88 // Creates the Browser Window. Prefer to use the static helpers above where |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 // The browser idle task helps cleanup unused memory resources when idle. | 630 // The browser idle task helps cleanup unused memory resources when idle. |
| 629 scoped_ptr<BrowserIdleTimer> idle_task_; | 631 scoped_ptr<BrowserIdleTimer> idle_task_; |
| 630 | 632 |
| 631 // Keep track of the encoding auto detect pref. | 633 // Keep track of the encoding auto detect pref. |
| 632 BooleanPrefMember encoding_auto_detect_; | 634 BooleanPrefMember encoding_auto_detect_; |
| 633 | 635 |
| 634 DISALLOW_COPY_AND_ASSIGN(Browser); | 636 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 635 }; | 637 }; |
| 636 | 638 |
| 637 #endif // CHROME_BROWSER_BROWSER_H_ | 639 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |