| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "content/public/browser/web_contents_delegate.h" | 39 #include "content/public/browser/web_contents_delegate.h" |
| 40 #include "content/public/common/page_transition_types.h" | 40 #include "content/public/common/page_transition_types.h" |
| 41 #include "content/public/common/page_zoom.h" | 41 #include "content/public/common/page_zoom.h" |
| 42 #include "ui/base/ui_base_types.h" | 42 #include "ui/base/ui_base_types.h" |
| 43 #include "ui/base/window_open_disposition.h" | 43 #include "ui/base/window_open_disposition.h" |
| 44 #include "ui/gfx/rect.h" | 44 #include "ui/gfx/rect.h" |
| 45 #include "ui/shell_dialogs/select_file_dialog.h" | 45 #include "ui/shell_dialogs/select_file_dialog.h" |
| 46 | 46 |
| 47 class BrowserContentSettingBubbleModelDelegate; | 47 class BrowserContentSettingBubbleModelDelegate; |
| 48 class BrowserInstantController; | 48 class BrowserInstantController; |
| 49 class BrowserLanguageStateObserver; |
| 49 class BrowserSyncedWindowDelegate; | 50 class BrowserSyncedWindowDelegate; |
| 50 class BrowserToolbarModelDelegate; | 51 class BrowserToolbarModelDelegate; |
| 51 class BrowserTabRestoreServiceDelegate; | 52 class BrowserTabRestoreServiceDelegate; |
| 52 class BrowserWindow; | 53 class BrowserWindow; |
| 53 class FindBarController; | 54 class FindBarController; |
| 54 class FullscreenController; | 55 class FullscreenController; |
| 55 class PrefService; | 56 class PrefService; |
| 56 class Profile; | 57 class Profile; |
| 57 class SearchDelegate; | 58 class SearchDelegate; |
| 58 class SearchModel; | 59 class SearchModel; |
| (...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 931 | 932 |
| 932 // True if the browser window has been shown at least once. | 933 // True if the browser window has been shown at least once. |
| 933 bool window_has_shown_; | 934 bool window_has_shown_; |
| 934 | 935 |
| 935 // The following factory is used for chrome update coalescing. | 936 // The following factory is used for chrome update coalescing. |
| 936 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 937 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 937 | 938 |
| 938 // The following factory is used to close the frame at a later time. | 939 // The following factory is used to close the frame at a later time. |
| 939 base::WeakPtrFactory<Browser> weak_factory_; | 940 base::WeakPtrFactory<Browser> weak_factory_; |
| 940 | 941 |
| 942 scoped_ptr<BrowserLanguageStateObserver> language_state_observer_; |
| 943 |
| 941 DISALLOW_COPY_AND_ASSIGN(Browser); | 944 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 942 }; | 945 }; |
| 943 | 946 |
| 944 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 947 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |