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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 content_size_ = gfx::Size(width, height); | 396 content_size_ = gfx::Size(width, height); |
397 if (!platform_) | 397 if (!platform_) |
398 platform_ = new ShellPlatformDataAura(content_size_); | 398 platform_ = new ShellPlatformDataAura(content_size_); |
399 else | 399 else |
400 platform_->ResizeWindow(content_size_); | 400 platform_->ResizeWindow(content_size_); |
401 return; | 401 return; |
402 } | 402 } |
403 #if defined(OS_CHROMEOS) | 403 #if defined(OS_CHROMEOS) |
404 window_widget_ = views::Widget::CreateWindowWithContextAndBounds( | 404 window_widget_ = views::Widget::CreateWindowWithContextAndBounds( |
405 new ShellWindowDelegateView(this), | 405 new ShellWindowDelegateView(this), |
406 wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()), | 406 wm_test_helper_->GetDefaultParent(nullptr, gfx::Rect()), |
407 gfx::Rect(0, 0, width, height)); | 407 gfx::Rect(0, 0, width, height)); |
408 #else | 408 #else |
409 window_widget_ = new views::Widget; | 409 window_widget_ = new views::Widget; |
410 views::Widget::InitParams params; | 410 views::Widget::InitParams params; |
411 params.bounds = gfx::Rect(0, 0, width, height); | 411 params.bounds = gfx::Rect(0, 0, width, height); |
412 params.delegate = new ShellWindowDelegateView(this); | 412 params.delegate = new ShellWindowDelegateView(this); |
413 params.wm_class_class = "chromium-content_shell"; | 413 params.wm_class_class = "chromium-content_shell"; |
414 params.wm_class_name = params.wm_class_class; | 414 params.wm_class_name = params.wm_class_class; |
415 window_widget_->Init(params); | 415 window_widget_->Init(params); |
416 #endif | 416 #endif |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 void Shell::PlatformSetTitle(const base::string16& title) { | 458 void Shell::PlatformSetTitle(const base::string16& title) { |
459 if (headless_) | 459 if (headless_) |
460 return; | 460 return; |
461 ShellWindowDelegateView* delegate_view = | 461 ShellWindowDelegateView* delegate_view = |
462 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); | 462 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); |
463 delegate_view->SetWindowTitle(title); | 463 delegate_view->SetWindowTitle(title); |
464 window_widget_->UpdateWindowTitle(); | 464 window_widget_->UpdateWindowTitle(); |
465 } | 465 } |
466 | 466 |
467 } // namespace content | 467 } // namespace content |
OLD | NEW |