Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/shell.h" | 5 #include "content/shell/browser/shell.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 } | 50 } |
| 51 | 51 |
| 52 virtual ~ShellViewsDelegateAura() { | 52 virtual ~ShellViewsDelegateAura() { |
| 53 } | 53 } |
| 54 | 54 |
| 55 void SetUseTransparentWindows(bool transparent) { | 55 void SetUseTransparentWindows(bool transparent) { |
| 56 use_transparent_windows_ = transparent; | 56 use_transparent_windows_ = transparent; |
| 57 } | 57 } |
| 58 | 58 |
| 59 // Overridden from views::TestViewsDelegate: | 59 // Overridden from views::TestViewsDelegate: |
| 60 virtual bool UseTransparentWindows() const OVERRIDE { | 60 virtual bool UseTransparentWindows( |
|
sky
2013/12/17 15:59:00
Didn't you remove this function from TestViewDeleg
Shrikant Kelkar
2013/12/17 18:01:00
Done.
| |
| 61 views::Widget::InitParams* params) const OVERRIDE { | |
| 61 return use_transparent_windows_; | 62 return use_transparent_windows_; |
| 62 } | 63 } |
| 63 | 64 |
| 64 private: | 65 private: |
| 65 bool use_transparent_windows_; | 66 bool use_transparent_windows_; |
| 66 | 67 |
| 67 DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura); | 68 DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura); |
| 68 }; | 69 }; |
| 69 | 70 |
| 70 // Maintain the UI controls and web view for content shell | 71 // Maintain the UI controls and web view for content shell |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 389 } | 390 } |
| 390 | 391 |
| 391 void Shell::PlatformSetTitle(const base::string16& title) { | 392 void Shell::PlatformSetTitle(const base::string16& title) { |
| 392 ShellWindowDelegateView* delegate_view = | 393 ShellWindowDelegateView* delegate_view = |
| 393 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); | 394 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); |
| 394 delegate_view->SetWindowTitle(title); | 395 delegate_view->SetWindowTitle(title); |
| 395 window_widget_->UpdateWindowTitle(); | 396 window_widget_->UpdateWindowTitle(); |
| 396 } | 397 } |
| 397 | 398 |
| 398 } // namespace content | 399 } // namespace content |
| OLD | NEW |