diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 12:27:03 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 12:27:03 +0000 |
| commit | 1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf (patch) | |
| tree | b78be07dbada3ac0f6d2435558e4a6aaba198ffc /chrome/browser/navigation_controller_base.h | |
| parent | ea15e98a9353494df754a11fb49f0e4b8c0d4789 (diff) | |
| download | chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.zip chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.tar.gz chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.tar.bz2 | |
Large patch set (159 files total) to cleanup the includes.
- Slightly reduce the size of the generated .lib files ~3%.
- Reduce the number of implicit and explicit atl and windows includes. hooray!
- Help incremental build by reducing the number of unnecessary included files.
- Split some template class in two, one base class for the common code and the specialization that inherits from the base class.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller_base.h')
| -rw-r--r-- | chrome/browser/navigation_controller_base.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/navigation_controller_base.h b/chrome/browser/navigation_controller_base.h index ada690f..6b33a58 100644 --- a/chrome/browser/navigation_controller_base.h +++ b/chrome/browser/navigation_controller_base.h @@ -27,16 +27,17 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef CHROME_BROWSER_NAVIGATION_CONTROLLER_BASE_H__ -#define CHROME_BROWSER_NAVIGATION_CONTROLLER_BASE_H__ +#ifndef CHROME_BROWSER_NAVIGATION_CONTROLLER_BASE_H_ +#define CHROME_BROWSER_NAVIGATION_CONTROLLER_BASE_H_ #include <vector> -#include "chrome/browser/site_instance.h" #include "chrome/browser/tab_contents_type.h" #include "chrome/common/page_transition_types.h" +#include "testing/gtest/include/gtest/gtest_prod.h" class NavigationEntry; +class SiteInstance; //////////////////////////////////////////////////////////////////////////////// // @@ -232,7 +233,7 @@ class NavigationControllerBase { // The maximum number of entries that a navigation controller can store. size_t max_entry_count_; - DISALLOW_EVIL_CONSTRUCTORS(NavigationControllerBase); + DISALLOW_COPY_AND_ASSIGN(NavigationControllerBase); }; -#endif // CHROME_BROWSER_NAVIGATION_CONTROLLER_BASE_H__ +#endif // CHROME_BROWSER_NAVIGATION_CONTROLLER_BASE_H_ |