diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 20:37:42 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 20:37:42 +0000 |
commit | 7d3feb91489d40903324d07d7cbe275adb9af0df (patch) | |
tree | 675beeef2c355189229cd6586640f88fa430ffa0 /chrome/browser/browser.cc | |
parent | bea5f17bd4205def93822c5d74c0519c1f21337c (diff) | |
download | chromium_src-7d3feb91489d40903324d07d7cbe275adb9af0df.zip chromium_src-7d3feb91489d40903324d07d7cbe275adb9af0df.tar.gz chromium_src-7d3feb91489d40903324d07d7cbe275adb9af0df.tar.bz2 |
Handful of changes to get views building again. The tab.cc ifdefs are
only short term. I'll stub out parts of chrome_menu next so that these
can be removed.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115406
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index c59f21e..9aaddee 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -67,7 +67,6 @@ #include "chrome/browser/browser_url_handler.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/debugger/debugger_window.h" -#include "chrome/browser/dock_info.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/task_manager.h" @@ -81,6 +80,10 @@ #include "chrome/browser/window_sizer.h" #endif +#if defined(TOOLKIT_VIEWS) +#include "chrome/browser/dock_info.h" +#endif + using base::TimeDelta; // How long we wait before updating the browser chrome while loading a page. |