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/tabs | |
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/tabs')
-rw-r--r-- | chrome/browser/tabs/dragged_tab_controller.cc | 5 | ||||
-rw-r--r-- | chrome/browser/tabs/dragged_tab_controller.h | 10 | ||||
-rw-r--r-- | chrome/browser/tabs/tab.cc | 6 | ||||
-rw-r--r-- | chrome/browser/tabs/tab.h | 12 | ||||
-rw-r--r-- | chrome/browser/tabs/tab_strip.cc | 1 |
5 files changed, 15 insertions, 19 deletions
diff --git a/chrome/browser/tabs/dragged_tab_controller.cc b/chrome/browser/tabs/dragged_tab_controller.cc index c522276..6a17a459 100644 --- a/chrome/browser/tabs/dragged_tab_controller.cc +++ b/chrome/browser/tabs/dragged_tab_controller.cc @@ -27,10 +27,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include <math.h> - #include "chrome/browser/tabs/dragged_tab_controller.h" +#include <math.h> + #include "chrome/browser/browser_window.h" #include "chrome/browser/frame_util.h" #include "chrome/browser/tab_contents.h" @@ -40,6 +40,7 @@ #include "chrome/browser/tabs/tab_strip.h" #include "chrome/browser/web_contents.h" #include "chrome/views/event.h" +#include "chrome/views/root_view.h" #include "skia/include/SkBitmap.h" static const int kHorizontalMoveThreshold = 16; // pixels diff --git a/chrome/browser/tabs/dragged_tab_controller.h b/chrome/browser/tabs/dragged_tab_controller.h index 690baf9..d3352c5 100644 --- a/chrome/browser/tabs/dragged_tab_controller.h +++ b/chrome/browser/tabs/dragged_tab_controller.h @@ -27,11 +27,11 @@ // (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_TABS_DRAGGED_TAB_CONTROLLER_H__ -#define CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H__ +#ifndef CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H_ +#define CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H_ -#include "base/gfx/point.h" #include "base/gfx/rect.h" +#include "base/message_loop.h" #include "chrome/browser/tab_contents_delegate.h" #include "chrome/browser/tabs/tab_renderer.h" #include "chrome/common/notification_service.h" @@ -303,7 +303,7 @@ class DraggedTabController : public TabContentsDelegate, // time of the last re-order event. int last_move_screen_x_; - DISALLOW_EVIL_CONSTRUCTORS(DraggedTabController); + DISALLOW_COPY_AND_ASSIGN(DraggedTabController); }; -#endif // CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H__ +#endif // CHROME_BROWSER_TABS_DRAGGED_TAB_CONTROLLER_H_ diff --git a/chrome/browser/tabs/tab.cc b/chrome/browser/tabs/tab.cc index f253faa..3dd5427 100644 --- a/chrome/browser/tabs/tab.cc +++ b/chrome/browser/tabs/tab.cc @@ -30,11 +30,7 @@ #include "chrome/browser/tabs/tab.h" #include "base/gfx/size.h" -#include "chrome/browser/tab_contents.h" -#include "chrome/browser/tabs/tab_strip.h" -#include "chrome/browser/profile.h" -#include "chrome/browser/user_metrics.h" -#include "chrome/common/l10n_util.h" +#include "chrome/views/view_container.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/chrome_menu.h" #include "chrome/views/tooltip_manager.h" diff --git a/chrome/browser/tabs/tab.h b/chrome/browser/tabs/tab.h index 8c78190..5b909cb 100644 --- a/chrome/browser/tabs/tab.h +++ b/chrome/browser/tabs/tab.h @@ -27,14 +27,12 @@ // (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_TABS_TAB_H__ -#define CHROME_BROWSER_TABS_TAB_H__ +#ifndef CHROME_BROWSER_TABS_TAB_H_ +#define CHROME_BROWSER_TABS_TAB_H_ -#include "base/gfx/point.h" #include "chrome/browser/tabs/tab_renderer.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/views/button.h" -#include "chrome/views/menu.h" +#include "chrome/views/base_button.h" namespace gfx { class Point; @@ -138,7 +136,7 @@ class Tab : public TabRenderer, // True if the tab is being animated closed. bool closing_; - DISALLOW_EVIL_CONSTRUCTORS(Tab); + DISALLOW_COPY_AND_ASSIGN(Tab); }; -#endif // CHROME_BROWSER_TABS_TAB_H__ +#endif // CHROME_BROWSER_TABS_TAB_H_ diff --git a/chrome/browser/tabs/tab_strip.cc b/chrome/browser/tabs/tab_strip.cc index f4b1447..1a757fa 100644 --- a/chrome/browser/tabs/tab_strip.cc +++ b/chrome/browser/tabs/tab_strip.cc @@ -40,6 +40,7 @@ #include "chrome/browser/view_ids.h" #include "chrome/browser/vista_frame.h" #include "chrome/browser/web_contents.h" +#include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" |