diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:16:53 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:16:53 +0000 |
| commit | e766106da8a18fc2d2dcf45968262763312f7071 (patch) | |
| tree | 1d426c74a7e1f62e6637c349ed7c4453ded441f7 /chrome/browser/ui/views/constrained_window_win.cc | |
| parent | 8450c4f5d875881bfcc1b728390d4a01e6538efa (diff) | |
| download | chromium_src-e766106da8a18fc2d2dcf45968262763312f7071.zip chromium_src-e766106da8a18fc2d2dcf45968262763312f7071.tar.gz chromium_src-e766106da8a18fc2d2dcf45968262763312f7071.tar.bz2 | |
Move UI-relevant Windows files to ui/base.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6254011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/constrained_window_win.cc')
| -rw-r--r-- | chrome/browser/ui/views/constrained_window_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index ac1d0d2..b2270ef 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/resource_bundle.h" -#include "app/win/hwnd_util.h" #include "app/win/win_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/win/hwnd_util.h" #include "views/controls/button/image_button.h" #include "views/focus/focus_manager.h" #include "views/window/client_view.h" @@ -198,7 +198,7 @@ class ConstrainedWindowFrameView SkColor GetTitleColor() const { return (container_->owner()->profile()->IsOffTheRecord() || - !app::win::ShouldUseVistaFrame()) ? SK_ColorWHITE : SK_ColorBLACK; + !ui::ShouldUseVistaFrame()) ? SK_ColorWHITE : SK_ColorBLACK; } // Loads the appropriate set of WindowResources for the frame view. @@ -535,7 +535,7 @@ gfx::Rect ConstrainedWindowFrameView::CalculateClientAreaBounds( } void ConstrainedWindowFrameView::InitWindowResources() { - resources_.reset(app::win::ShouldUseVistaFrame() ? + resources_.reset(ui::ShouldUseVistaFrame() ? static_cast<views::WindowResources*>(new VistaWindowResources) : new XPWindowResources); } |