OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/views/frame/browser_frame_win.h" | 5 #include "chrome/browser/views/frame/browser_frame_win.h" |
6 | 6 |
7 #include <dwmapi.h> | 7 #include <dwmapi.h> |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
11 | 11 |
12 #include "app/resource_bundle.h" | |
13 #include "app/theme_provider.h" | |
14 #include "app/win_util.h" | 12 #include "app/win_util.h" |
15 #include "base/win_util.h" | 13 #include "base/win_util.h" |
16 #include "chrome/browser/profile.h" | 14 #include "chrome/browser/profile.h" |
17 #include "chrome/browser/browser_list.h" | 15 #include "chrome/browser/browser_list.h" |
18 #include "chrome/browser/browser_theme_provider.h" | 16 #include "chrome/browser/browser_theme_provider.h" |
19 #include "chrome/browser/views/frame/app_panel_browser_frame_view.h" | 17 #include "chrome/browser/views/frame/app_panel_browser_frame_view.h" |
20 #include "chrome/browser/views/frame/browser_non_client_frame_view.h" | 18 #include "chrome/browser/views/frame/browser_non_client_frame_view.h" |
21 #include "chrome/browser/views/frame/browser_root_view.h" | 19 #include "chrome/browser/views/frame/browser_root_view.h" |
22 #include "chrome/browser/views/frame/browser_view.h" | 20 #include "chrome/browser/views/frame/browser_view.h" |
23 #include "chrome/browser/views/frame/glass_browser_frame_view.h" | 21 #include "chrome/browser/views/frame/glass_browser_frame_view.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 margins.cyTopHeight = | 316 margins.cyTopHeight = |
319 GetBoundsForTabStrip(browser_view_->tabstrip()).bottom() + | 317 GetBoundsForTabStrip(browser_view_->tabstrip()).bottom() + |
320 kDWMFrameTopOffset; | 318 kDWMFrameTopOffset; |
321 } | 319 } |
322 } | 320 } |
323 } else { | 321 } else { |
324 // For popup and app windows we want to use the default margins. | 322 // For popup and app windows we want to use the default margins. |
325 } | 323 } |
326 DwmExtendFrameIntoClientArea(GetNativeView(), &margins); | 324 DwmExtendFrameIntoClientArea(GetNativeView(), &margins); |
327 } | 325 } |
OLD | NEW |