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 26 matching lines...) Expand all Loading... |
37 class TabNavigation; | 37 class TabNavigation; |
38 | 38 |
39 class Browser : public TabStripModelDelegate, | 39 class Browser : public TabStripModelDelegate, |
40 public TabStripModelObserver, | 40 public TabStripModelObserver, |
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. |
| 48 // TODO(sky): move into a common place that is referenced by both ui_tests |
| 49 // and chrome. |
47 enum Type { | 50 enum Type { |
48 TYPE_NORMAL = 0, | 51 TYPE_NORMAL = 0, |
49 TYPE_POPUP = 1, | 52 TYPE_POPUP = 1, |
50 TYPE_APP = 2, | 53 TYPE_APP = 2, |
51 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, | 54 TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP, |
52 }; | 55 }; |
53 | 56 |
54 // Possible elements of the Browser window. | 57 // Possible elements of the Browser window. |
55 enum WindowFeature { | 58 enum WindowFeature { |
56 FEATURE_TITLEBAR = 1, | 59 FEATURE_TITLEBAR = 1, |
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
806 // Dialog box used for opening and saving files. | 809 // Dialog box used for opening and saving files. |
807 scoped_refptr<SelectFileDialog> select_file_dialog_; | 810 scoped_refptr<SelectFileDialog> select_file_dialog_; |
808 | 811 |
809 // Keep track of the encoding auto detect pref. | 812 // Keep track of the encoding auto detect pref. |
810 BooleanPrefMember encoding_auto_detect_; | 813 BooleanPrefMember encoding_auto_detect_; |
811 | 814 |
812 DISALLOW_COPY_AND_ASSIGN(Browser); | 815 DISALLOW_COPY_AND_ASSIGN(Browser); |
813 }; | 816 }; |
814 | 817 |
815 #endif // CHROME_BROWSER_BROWSER_H_ | 818 #endif // CHROME_BROWSER_BROWSER_H_ |
OLD | NEW |