OLD | NEW |
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_aura.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/themes/theme_service.h" | 8 #include "chrome/browser/themes/theme_service.h" |
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h" | 9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h" |
10 #include "chrome/browser/ui/views/frame/browser_view.h" | 10 #include "chrome/browser/ui/views/frame/browser_view.h" |
11 #include "grit/theme_resources_standard.h" | 11 #include "grit/theme_resources_standard.h" |
12 #include "third_party/skia/include/core/SkBitmap.h" | 12 #include "third_party/skia/include/core/SkBitmap.h" |
13 #include "third_party/skia/include/core/SkCanvas.h" | 13 #include "third_party/skia/include/core/SkCanvas.h" |
14 #include "third_party/skia/include/core/SkColor.h" | 14 #include "third_party/skia/include/core/SkColor.h" |
15 #include "ui/aura/aura_switches.h" | 15 #include "ui/aura/aura_switches.h" |
| 16 #include "ui/aura/client/aura_constants.h" |
| 17 #include "ui/aura/client/shadow_types.h" |
| 18 #include "ui/aura/window.h" |
16 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
17 #include "ui/base/theme_provider.h" | 20 #include "ui/base/theme_provider.h" |
18 #include "ui/gfx/canvas.h" | 21 #include "ui/gfx/canvas.h" |
19 #include "ui/gfx/compositor/layer.h" | 22 #include "ui/gfx/compositor/layer.h" |
20 #include "ui/gfx/font.h" | 23 #include "ui/gfx/font.h" |
21 #include "views/background.h" | 24 #include "views/background.h" |
22 | 25 |
23 namespace { | 26 namespace { |
24 | 27 |
25 // The content left/right images have a shadow built into them. | 28 // The content left/right images have a shadow built into them. |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 : views::NativeWidgetAura(browser_frame), | 165 : views::NativeWidgetAura(browser_frame), |
163 browser_view_(browser_view), | 166 browser_view_(browser_view), |
164 browser_frame_(browser_frame) { | 167 browser_frame_(browser_frame) { |
165 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraWindows)) { | 168 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraWindows)) { |
166 // Aura paints layers behind this view, so this must be a layer also. | 169 // Aura paints layers behind this view, so this must be a layer also. |
167 // TODO: see if we can avoid this, layers are expensive. | 170 // TODO: see if we can avoid this, layers are expensive. |
168 browser_view_->SetPaintToLayer(true); | 171 browser_view_->SetPaintToLayer(true); |
169 browser_view_->layer()->SetFillsBoundsOpaquely(false); | 172 browser_view_->layer()->SetFillsBoundsOpaquely(false); |
170 // Background only needed for Aura-style windows. | 173 // Background only needed for Aura-style windows. |
171 browser_view_->set_background(new ToolbarBackground(browser_view)); | 174 browser_view_->set_background(new ToolbarBackground(browser_view)); |
| 175 } else { |
| 176 GetNativeWindow()->SetIntProperty(aura::kShadowTypeKey, |
| 177 aura::SHADOW_TYPE_RECTANGULAR); |
172 } | 178 } |
173 } | 179 } |
174 | 180 |
175 BrowserFrameAura::~BrowserFrameAura() { | 181 BrowserFrameAura::~BrowserFrameAura() { |
176 } | 182 } |
177 | 183 |
178 /////////////////////////////////////////////////////////////////////////////// | 184 /////////////////////////////////////////////////////////////////////////////// |
179 // BrowserFrameAura, views::NativeWidgetAura overrides: | 185 // BrowserFrameAura, views::NativeWidgetAura overrides: |
180 | 186 |
181 //////////////////////////////////////////////////////////////////////////////// | 187 //////////////////////////////////////////////////////////////////////////////// |
(...skipping 25 matching lines...) Expand all Loading... |
207 | 213 |
208 //////////////////////////////////////////////////////////////////////////////// | 214 //////////////////////////////////////////////////////////////////////////////// |
209 // NativeBrowserFrame, public: | 215 // NativeBrowserFrame, public: |
210 | 216 |
211 // static | 217 // static |
212 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 218 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |
213 BrowserFrame* browser_frame, | 219 BrowserFrame* browser_frame, |
214 BrowserView* browser_view) { | 220 BrowserView* browser_view) { |
215 return new BrowserFrameAura(browser_frame, browser_view); | 221 return new BrowserFrameAura(browser_frame, browser_view); |
216 } | 222 } |
OLD | NEW |