Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame_win.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/views/frame/browser_frame_win.h" 5 #include "chrome/browser/ui/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 "chrome/browser/accessibility/browser_accessibility_state.h" 12 #include "chrome/browser/accessibility/browser_accessibility_state.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/browser_list.h" 14 #include "chrome/browser/browser_list.h"
15 #include "chrome/browser/themes/browser_theme_provider.h" 15 #include "chrome/browser/themes/browser_theme_provider.h"
16 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 16 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
17 #include "chrome/browser/ui/views/frame/browser_root_view.h" 17 #include "chrome/browser/ui/views/frame/browser_root_view.h"
18 #include "chrome/browser/ui/views/frame/browser_view.h" 18 #include "chrome/browser/ui/views/frame/browser_view.h"
19 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" 19 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
20 #include "gfx/font.h"
21 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
21 #include "ui/gfx/font.h"
22 #include "views/screen.h" 22 #include "views/screen.h"
23 #include "views/widget/widget_win.h" 23 #include "views/widget/widget_win.h"
24 #include "views/window/window_delegate.h" 24 #include "views/window/window_delegate.h"
25 #include "views/window/window_win.h" 25 #include "views/window/window_win.h"
26 26
27 // static 27 // static
28 static const int kClientEdgeThickness = 3; 28 static const int kClientEdgeThickness = 3;
29 static const int kTabDragWindowAlpha = 200; 29 static const int kTabDragWindowAlpha = 200;
30 // We need to offset the DWMFrame into the toolbar so that the blackness 30 // We need to offset the DWMFrame into the toolbar so that the blackness
31 // doesn't show up on our rounded corners. 31 // doesn't show up on our rounded corners.
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 gfx::Rect tabstrip_bounds( 307 gfx::Rect tabstrip_bounds(
308 GetBoundsForTabStrip(browser_view_->tabstrip())); 308 GetBoundsForTabStrip(browser_view_->tabstrip()));
309 margins.cyTopHeight = (browser_view_->UseVerticalTabs() ? 309 margins.cyTopHeight = (browser_view_->UseVerticalTabs() ?
310 tabstrip_bounds.y() : tabstrip_bounds.bottom()) + kDWMFrameTopOffset; 310 tabstrip_bounds.y() : tabstrip_bounds.bottom()) + kDWMFrameTopOffset;
311 } 311 }
312 } else { 312 } else {
313 // For popup and app windows we want to use the default margins. 313 // For popup and app windows we want to use the default margins.
314 } 314 }
315 DwmExtendFrameIntoClientArea(GetNativeView(), &margins); 315 DwmExtendFrameIntoClientArea(GetNativeView(), &margins);
316 } 316 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_gtk.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698