diff options
author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
tree | 382278a54ce7a744d62fa510a9a80688cc12434b /chrome/browser/aeropeek_manager.h | |
parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'chrome/browser/aeropeek_manager.h')
-rw-r--r-- | chrome/browser/aeropeek_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/aeropeek_manager.h b/chrome/browser/aeropeek_manager.h index 1e26af6..58eaf07 100644 --- a/chrome/browser/aeropeek_manager.h +++ b/chrome/browser/aeropeek_manager.h @@ -11,7 +11,7 @@ #include <list> #include "chrome/browser/tabs/tab_strip_model_observer.h" -#include "gfx/insets.h" +#include "ui/gfx/insets.h" namespace gfx { class Size; |