diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 20:33:23 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 20:33:23 +0000 |
| commit | c98fe6fa60b3262364158809ca0d462f1009709f (patch) | |
| tree | ced35f47a361eb85b6db911c066be70e9c77a2b1 /chrome/browser | |
| parent | 309c8ff514d506364567d9e6095a295b8d5c3d3e (diff) | |
| download | chromium_src-c98fe6fa60b3262364158809ca0d462f1009709f.zip chromium_src-c98fe6fa60b3262364158809ca0d462f1009709f.tar.gz chromium_src-c98fe6fa60b3262364158809ca0d462f1009709f.tar.bz2 | |
Enable the ToolbarModel on Mac and Linux. Implement ChromeFont on Mac.
Review URL: http://codereview.chromium.org/28124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/browser.h | 2 | ||||
| -rw-r--r-- | chrome/browser/browser.scons | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 6866cf4..b9c5a56 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -12,6 +12,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_shutdown.h" +#include "chrome/browser/browser_window.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/metrics/user_metrics.h" @@ -54,7 +55,6 @@ #include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_url_handler.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/debugger/debugger_window.h" diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 35c615f..fdcb365 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -21,6 +21,7 @@ #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "chrome/browser/toolbar_model.h" #include "chrome/common/notification_observer.h" #include "chrome/common/pref_member.h" #include "base/gfx/rect.h" @@ -30,7 +31,6 @@ #if defined(OS_WIN) #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/toolbar_model.h" #endif class BrowserIdleTimer; diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 5a5f0b4..789cab1 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -719,7 +719,6 @@ if not env.Bit('windows'): 'tab_contents/web_drop_target.cc', 'task_manager.cc', 'task_manager_resource_providers.cc', - 'toolbar_model.cc', 'views/download_tab_view.cc', 'window_sizer.cc', ) |