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

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

Issue 8968022: Shell related switches -> aura shell switches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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_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"
16 #include "ui/aura/client/aura_constants.h" 15 #include "ui/aura/client/aura_constants.h"
17 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura_shell/aura_shell_switches.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/base/theme_provider.h" 19 #include "ui/base/theme_provider.h"
20 #include "ui/gfx/canvas.h" 20 #include "ui/gfx/canvas.h"
21 #include "ui/gfx/compositor/layer.h" 21 #include "ui/gfx/compositor/layer.h"
22 #include "ui/gfx/font.h" 22 #include "ui/gfx/font.h"
23 #include "ui/views/background.h" 23 #include "ui/views/background.h"
24 24
25 namespace { 25 namespace {
26 26
27 // The content left/right images have a shadow built into them. 27 // The content left/right images have a shadow built into them.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 /////////////////////////////////////////////////////////////////////////////// 159 ///////////////////////////////////////////////////////////////////////////////
160 // BrowserFrameAura, public: 160 // BrowserFrameAura, public:
161 161
162 BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame, 162 BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame,
163 BrowserView* browser_view) 163 BrowserView* browser_view)
164 : views::NativeWidgetAura(browser_frame), 164 : views::NativeWidgetAura(browser_frame),
165 browser_view_(browser_view), 165 browser_view_(browser_view),
166 browser_frame_(browser_frame) { 166 browser_frame_(browser_frame) {
167 CommandLine* command_line = CommandLine::ForCurrentProcess(); 167 CommandLine* command_line = CommandLine::ForCurrentProcess();
168 if (command_line->HasSwitch(switches::kAuraTranslucentFrames)) { 168 if (command_line->HasSwitch(aura_shell::switches::kAuraTranslucentFrames)) {
169 // 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.
170 // TODO: see if we can avoid this, layers are expensive. 170 // TODO: see if we can avoid this, layers are expensive.
171 browser_view_->SetPaintToLayer(true); 171 browser_view_->SetPaintToLayer(true);
172 browser_view_->layer()->SetFillsBoundsOpaquely(false); 172 browser_view_->layer()->SetFillsBoundsOpaquely(false);
173 // Background only needed for Aura-style windows. 173 // Background only needed for Aura-style windows.
174 browser_view_->set_background(new ToolbarBackground(browser_view)); 174 browser_view_->set_background(new ToolbarBackground(browser_view));
175 } 175 }
176 } 176 }
177 177
178 BrowserFrameAura::~BrowserFrameAura() { 178 BrowserFrameAura::~BrowserFrameAura() {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 //////////////////////////////////////////////////////////////////////////////// 211 ////////////////////////////////////////////////////////////////////////////////
212 // NativeBrowserFrame, public: 212 // NativeBrowserFrame, public:
213 213
214 // static 214 // static
215 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( 215 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
216 BrowserFrame* browser_frame, 216 BrowserFrame* browser_frame,
217 BrowserView* browser_view) { 217 BrowserView* browser_view) {
218 return new BrowserFrameAura(browser_frame, browser_view); 218 return new BrowserFrameAura(browser_frame, browser_view);
219 } 219 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698