OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 | 9 |
10 #include <set> | 10 #include <set> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #if defined(OS_MACOSX) | 13 #if defined(OS_MACOSX) |
14 // Remove when we've finished porting the supporting classes. | 14 // Remove when we've finished porting the supporting classes. |
15 #include "chrome/common/temp_scaffolding_stubs.h" | 15 #include "chrome/common/temp_scaffolding_stubs.h" |
16 #endif | 16 #endif |
17 | 17 |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/browser_window.h" | 19 #include "chrome/browser/browser_window.h" |
20 #include "chrome/browser/command_updater.h" | 20 #include "chrome/browser/command_updater.h" |
21 #include "chrome/browser/sessions/session_id.h" | 21 #include "chrome/browser/sessions/session_id.h" |
22 #include "chrome/browser/tab_contents/tab_contents.h" | 22 #include "chrome/browser/tab_contents/tab_contents.h" |
23 #include "chrome/browser/tabs/tab_strip_model.h" | 23 #include "chrome/browser/tabs/tab_strip_model.h" |
24 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 24 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
25 #include "chrome/browser/toolbar_model.h" | 25 #include "chrome/browser/toolbar_model.h" |
26 #include "chrome/common/notification_observer.h" | 26 #include "chrome/common/notification_observer.h" |
27 #include "chrome/common/pref_member.h" | 27 #include "chrome/common/pref_member.h" |
28 #include "base/gfx/rect.h" | 28 #include "base/gfx/rect.h" |
| 29 #include "base/scoped_ptr.h" |
29 #include "base/task.h" | 30 #include "base/task.h" |
30 #include "skia/include/SkBitmap.h" | 31 #include "skia/include/SkBitmap.h" |
31 | 32 |
32 #if defined(OS_WIN) || defined(OS_LINUX) | 33 #if defined(OS_WIN) || defined(OS_LINUX) |
33 #include "chrome/browser/shell_dialogs.h" | 34 #include "chrome/browser/shell_dialogs.h" |
34 #endif | 35 #endif |
35 | 36 |
36 class BrowserIdleTimer; | 37 class BrowserIdleTimer; |
37 class BrowserWindow; | 38 class BrowserWindow; |
38 class DebuggerWindow; | 39 class DebuggerWindow; |
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
665 // The browser idle task helps cleanup unused memory resources when idle. | 666 // The browser idle task helps cleanup unused memory resources when idle. |
666 scoped_ptr<BrowserIdleTimer> idle_task_; | 667 scoped_ptr<BrowserIdleTimer> idle_task_; |
667 | 668 |
668 // Keep track of the encoding auto detect pref. | 669 // Keep track of the encoding auto detect pref. |
669 BooleanPrefMember encoding_auto_detect_; | 670 BooleanPrefMember encoding_auto_detect_; |
670 | 671 |
671 DISALLOW_COPY_AND_ASSIGN(Browser); | 672 DISALLOW_COPY_AND_ASSIGN(Browser); |
672 }; | 673 }; |
673 | 674 |
674 #endif // CHROME_BROWSER_BROWSER_H_ | 675 #endif // CHROME_BROWSER_BROWSER_H_ |
OLD | NEW |