| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/instant/instant_controller_delegate.h" | 23 #include "chrome/browser/instant/instant_controller_delegate.h" |
| 24 #include "chrome/browser/intents/device_attached_intent_source.h" | 24 #include "chrome/browser/intents/device_attached_intent_source.h" |
| 25 #include "chrome/browser/prefs/pref_change_registrar.h" | 25 #include "chrome/browser/prefs/pref_change_registrar.h" |
| 26 #include "chrome/browser/prefs/pref_member.h" | 26 #include "chrome/browser/prefs/pref_member.h" |
| 27 #include "chrome/browser/sessions/session_id.h" | 27 #include "chrome/browser/sessions/session_id.h" |
| 28 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" | 28 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" |
| 29 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 29 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| 30 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 30 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
| 31 #include "chrome/browser/ui/browser_navigator.h" | 31 #include "chrome/browser/ui/browser_navigator.h" |
| 32 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" | 32 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" |
| 33 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" | 33 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" |
| 34 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 34 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 35 #include "chrome/browser/ui/select_file_dialog.h" | 35 #include "chrome/browser/ui/select_file_dialog.h" |
| 36 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 36 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 37 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" | 37 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" |
| 38 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 38 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 39 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 39 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 40 #include "chrome/browser/ui/zoom/zoom_observer.h" | 40 #include "chrome/browser/ui/zoom/zoom_observer.h" |
| 41 #include "chrome/common/content_settings.h" | 41 #include "chrome/common/content_settings.h" |
| 42 #include "chrome/common/content_settings_types.h" | 42 #include "chrome/common/content_settings_types.h" |
| 43 #include "chrome/common/extensions/extension_constants.h" | 43 #include "chrome/common/extensions/extension_constants.h" |
| (...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1127 bool window_has_shown_; | 1127 bool window_has_shown_; |
| 1128 | 1128 |
| 1129 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1129 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1130 // before DidEndColorChooser is called. | 1130 // before DidEndColorChooser is called. |
| 1131 scoped_ptr<content::ColorChooser> color_chooser_; | 1131 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1132 | 1132 |
| 1133 DISALLOW_COPY_AND_ASSIGN(Browser); | 1133 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1134 }; | 1134 }; |
| 1135 | 1135 |
| 1136 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1136 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |