| 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 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/browser/ui/browser_navigator.h" | 25 #include "chrome/browser/ui/browser_navigator.h" |
| 26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" | 26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" |
| 27 #include "chrome/browser/ui/host_desktop.h" | 27 #include "chrome/browser/ui/host_desktop.h" |
| 28 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 28 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 29 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 29 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 30 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 30 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 31 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 31 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 32 #include "chrome/browser/ui/zoom/zoom_observer.h" | 32 #include "chrome/browser/ui/zoom/zoom_observer.h" |
| 33 #include "chrome/common/content_settings.h" | 33 #include "chrome/common/content_settings.h" |
| 34 #include "chrome/common/content_settings_types.h" | 34 #include "chrome/common/content_settings_types.h" |
| 35 #include "chrome/common/extensions/extension_constants.h" | |
| 36 #include "content/public/browser/notification_observer.h" | 35 #include "content/public/browser/notification_observer.h" |
| 37 #include "content/public/browser/notification_registrar.h" | 36 #include "content/public/browser/notification_registrar.h" |
| 38 #include "content/public/browser/page_navigator.h" | 37 #include "content/public/browser/page_navigator.h" |
| 39 #include "content/public/browser/web_contents_delegate.h" | 38 #include "content/public/browser/web_contents_delegate.h" |
| 40 #include "content/public/common/page_transition_types.h" | 39 #include "content/public/common/page_transition_types.h" |
| 41 #include "content/public/common/page_zoom.h" | 40 #include "content/public/common/page_zoom.h" |
| 42 #include "ui/base/ui_base_types.h" | 41 #include "ui/base/ui_base_types.h" |
| 43 #include "ui/base/window_open_disposition.h" | 42 #include "ui/base/window_open_disposition.h" |
| 44 #include "ui/gfx/rect.h" | 43 #include "ui/gfx/rect.h" |
| 45 #include "ui/shell_dialogs/select_file_dialog.h" | 44 #include "ui/shell_dialogs/select_file_dialog.h" |
| (...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 929 base::WeakPtrFactory<Browser> weak_factory_; | 928 base::WeakPtrFactory<Browser> weak_factory_; |
| 930 | 929 |
| 931 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; | 930 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; |
| 932 | 931 |
| 933 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; | 932 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; |
| 934 | 933 |
| 935 DISALLOW_COPY_AND_ASSIGN(Browser); | 934 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 936 }; | 935 }; |
| 937 | 936 |
| 938 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 937 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |