| 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 <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 public TabContentsDelegate, | 41 public TabContentsDelegate, |
| 42 public PageNavigator, | 42 public PageNavigator, |
| 43 public CommandUpdater::CommandUpdaterDelegate, | 43 public CommandUpdater::CommandUpdaterDelegate, |
| 44 public NotificationObserver, | 44 public NotificationObserver, |
| 45 public SelectFileDialog::Listener { | 45 public SelectFileDialog::Listener { |
| 46 public: | 46 public: |
| 47 // If you change the values in this enum you'll need to update browser_proxy. | 47 // If you change the values in this enum you'll need to update browser_proxy. |
| 48 // TODO(sky): move into a common place that is referenced by both ui_tests | 48 // TODO(sky): move into a common place that is referenced by both ui_tests |
| 49 // and chrome. | 49 // and chrome. |
| 50 enum Type { | 50 enum Type { |
| 51 TYPE_NORMAL = 0, | 51 TYPE_NORMAL = 1, |
| 52 TYPE_POPUP = 1, | 52 TYPE_POPUP = 2, |
| 53 TYPE_APP = 2, | 53 TYPE_APP = 4, |
| 54 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, | 54 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, |
| 55 TYPE_ANY = TYPE_NORMAL | TYPE_POPUP | TYPE_APP |
| 55 }; | 56 }; |
| 56 | 57 |
| 57 // Possible elements of the Browser window. | 58 // Possible elements of the Browser window. |
| 58 enum WindowFeature { | 59 enum WindowFeature { |
| 59 FEATURE_TITLEBAR = 1, | 60 FEATURE_TITLEBAR = 1, |
| 60 FEATURE_TABSTRIP = 2, | 61 FEATURE_TABSTRIP = 2, |
| 61 FEATURE_TOOLBAR = 4, | 62 FEATURE_TOOLBAR = 4, |
| 62 FEATURE_LOCATIONBAR = 8, | 63 FEATURE_LOCATIONBAR = 8, |
| 63 FEATURE_BOOKMARKBAR = 16, | 64 FEATURE_BOOKMARKBAR = 16, |
| 64 FEATURE_INFOBAR = 32, | 65 FEATURE_INFOBAR = 32, |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 // Dialog box used for opening and saving files. | 819 // Dialog box used for opening and saving files. |
| 819 scoped_refptr<SelectFileDialog> select_file_dialog_; | 820 scoped_refptr<SelectFileDialog> select_file_dialog_; |
| 820 | 821 |
| 821 // Keep track of the encoding auto detect pref. | 822 // Keep track of the encoding auto detect pref. |
| 822 BooleanPrefMember encoding_auto_detect_; | 823 BooleanPrefMember encoding_auto_detect_; |
| 823 | 824 |
| 824 DISALLOW_COPY_AND_ASSIGN(Browser); | 825 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 825 }; | 826 }; |
| 826 | 827 |
| 827 #endif // CHROME_BROWSER_BROWSER_H_ | 828 #endif // CHROME_BROWSER_BROWSER_H_ |
| OLD | NEW |