OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/shell/shell.h" | 5 #include "content/shell/shell.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
10 #include "content/public/browser/web_contents_view.h" | 10 #include "content/public/browser/web_contents_view.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 #include "ui/aura/test/test_screen.h" | 34 #include "ui/aura/test/test_screen.h" |
35 #endif | 35 #endif |
36 | 36 |
37 // ViewDelegate implementation for aura content shell | 37 // ViewDelegate implementation for aura content shell |
38 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate { | 38 class ShellViewsDelegateAura : public views::DesktopTestViewsDelegate { |
39 public: | 39 public: |
40 ShellViewsDelegateAura() : use_transparent_windows_(false) { | 40 ShellViewsDelegateAura() : use_transparent_windows_(false) { |
41 } | 41 } |
42 | 42 |
43 virtual ~ShellViewsDelegateAura() { | 43 virtual ~ShellViewsDelegateAura() { |
44 ViewsDelegate::views_delegate = NULL; | |
45 } | 44 } |
46 | 45 |
47 void SetUseTransparentWindows(bool transparent) { | 46 void SetUseTransparentWindows(bool transparent) { |
48 use_transparent_windows_ = transparent; | 47 use_transparent_windows_ = transparent; |
49 } | 48 } |
50 | 49 |
51 // Overridden from views::TestViewsDelegate: | 50 // Overridden from views::TestViewsDelegate: |
52 virtual bool UseTransparentWindows() const OVERRIDE { | 51 virtual bool UseTransparentWindows() const OVERRIDE { |
53 return use_transparent_windows_; | 52 return use_transparent_windows_; |
54 } | 53 } |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 } | 368 } |
370 | 369 |
371 void Shell::PlatformSetTitle(const string16& title) { | 370 void Shell::PlatformSetTitle(const string16& title) { |
372 ShellWindowDelegateView* delegate_view = | 371 ShellWindowDelegateView* delegate_view = |
373 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); | 372 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); |
374 delegate_view->SetWindowTitle(title); | 373 delegate_view->SetWindowTitle(title); |
375 window_widget_->UpdateWindowTitle(); | 374 window_widget_->UpdateWindowTitle(); |
376 } | 375 } |
377 | 376 |
378 } // namespace content | 377 } // namespace content |
OLD | NEW |