| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/gtest_prod_util.h" | 16 #include "base/gtest_prod_util.h" |
| 17 #include "base/memory/scoped_ptr.h" | 17 #include "base/memory/scoped_ptr.h" |
| 18 #include "base/string16.h" | 18 #include "base/string16.h" |
| 19 #include "base/task.h" | 19 #include "base/task.h" |
| 20 #include "chrome/browser/command_updater.h" | 20 #include "chrome/browser/command_updater.h" |
| 21 #include "chrome/browser/debugger/devtools_toggle_action.h" | |
| 22 #include "chrome/browser/instant/instant_delegate.h" | 21 #include "chrome/browser/instant/instant_delegate.h" |
| 23 #include "chrome/browser/prefs/pref_member.h" | 22 #include "chrome/browser/prefs/pref_member.h" |
| 24 #include "chrome/browser/prefs/pref_change_registrar.h" | 23 #include "chrome/browser/prefs/pref_change_registrar.h" |
| 25 #include "chrome/browser/sessions/session_id.h" | 24 #include "chrome/browser/sessions/session_id.h" |
| 26 #include "chrome/browser/sessions/tab_restore_service_observer.h" | 25 #include "chrome/browser/sessions/tab_restore_service_observer.h" |
| 27 #include "chrome/browser/sync/profile_sync_service_observer.h" | 26 #include "chrome/browser/sync/profile_sync_service_observer.h" |
| 28 #include "chrome/browser/tabs/tab_handler.h" | 27 #include "chrome/browser/tabs/tab_handler.h" |
| 29 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove | 28 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove |
| 30 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove | 29 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove |
| 31 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" | 30 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" |
| 32 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 31 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| 33 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 32 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
| 34 #include "chrome/browser/ui/browser_navigator.h" | 33 #include "chrome/browser/ui/browser_navigator.h" |
| 35 #include "chrome/browser/ui/download/download_tab_helper_delegate.h" | 34 #include "chrome/browser/ui/download/download_tab_helper_delegate.h" |
| 36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 35 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 37 #include "chrome/browser/ui/shell_dialogs.h" | 36 #include "chrome/browser/ui/shell_dialogs.h" |
| 38 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" | 37 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" |
| 39 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 38 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 40 #include "chrome/common/content_settings_types.h" | 39 #include "chrome/common/content_settings_types.h" |
| 41 #include "chrome/common/extensions/extension_constants.h" | 40 #include "chrome/common/extensions/extension_constants.h" |
| 41 #include "content/browser/debugger/devtools_toggle_action.h" |
| 42 #include "content/browser/tab_contents/page_navigator.h" | 42 #include "content/browser/tab_contents/page_navigator.h" |
| 43 #include "content/browser/tab_contents/tab_contents_delegate.h" | 43 #include "content/browser/tab_contents/tab_contents_delegate.h" |
| 44 #include "content/common/notification_registrar.h" | 44 #include "content/common/notification_registrar.h" |
| 45 #include "content/common/page_transition_types.h" | 45 #include "content/common/page_transition_types.h" |
| 46 #include "content/common/page_zoom.h" | 46 #include "content/common/page_zoom.h" |
| 47 #include "ui/gfx/rect.h" | 47 #include "ui/gfx/rect.h" |
| 48 | 48 |
| 49 class BrowserTabRestoreServiceDelegate; | 49 class BrowserTabRestoreServiceDelegate; |
| 50 class BrowserWindow; | 50 class BrowserWindow; |
| 51 class Extension; | 51 class Extension; |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1258 | 1258 |
| 1259 scoped_ptr<InstantController> instant_; | 1259 scoped_ptr<InstantController> instant_; |
| 1260 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1260 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1261 | 1261 |
| 1262 BookmarkBar::State bookmark_bar_state_; | 1262 BookmarkBar::State bookmark_bar_state_; |
| 1263 | 1263 |
| 1264 DISALLOW_COPY_AND_ASSIGN(Browser); | 1264 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1265 }; | 1265 }; |
| 1266 | 1266 |
| 1267 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1267 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |