| 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 "content/public/browser/web_contents.h" | 7 #include "content/public/browser/web_contents.h" |
| 8 #include "content/public/browser/web_contents_view.h" | 8 #include "content/public/browser/web_contents_view.h" |
| 9 #include "content/shell/browser/shell_aura.h" | 9 #include "content/shell/browser/shell_aura.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 new aura::client::DefaultCaptureClient(root_window_->window())); | 140 new aura::client::DefaultCaptureClient(root_window_->window())); |
| 141 window_tree_client_.reset( | 141 window_tree_client_.reset( |
| 142 new aura::test::TestWindowTreeClient(root_window_->window())); | 142 new aura::test::TestWindowTreeClient(root_window_->window())); |
| 143 ime_filter_.reset(new MinimalInputEventFilter(root_window_.get())); | 143 ime_filter_.reset(new MinimalInputEventFilter(root_window_.get())); |
| 144 } | 144 } |
| 145 | 145 |
| 146 ShellAuraPlatformData::~ShellAuraPlatformData() { | 146 ShellAuraPlatformData::~ShellAuraPlatformData() { |
| 147 } | 147 } |
| 148 | 148 |
| 149 void ShellAuraPlatformData::ResizeWindow(int width, int height) { | 149 void ShellAuraPlatformData::ResizeWindow(int width, int height) { |
| 150 root_window_->host()->SetBounds(gfx::Rect(width, height)); | 150 root_window_->SetHostSize(gfx::Size(width, height)); |
| 151 } | 151 } |
| 152 | 152 |
| 153 // static | 153 // static |
| 154 void Shell::PlatformInitialize(const gfx::Size& default_window_size) { | 154 void Shell::PlatformInitialize(const gfx::Size& default_window_size) { |
| 155 CHECK(!platform_); | 155 CHECK(!platform_); |
| 156 aura::Env::CreateInstance(); | 156 aura::Env::CreateInstance(); |
| 157 platform_ = new ShellAuraPlatformData(); | 157 platform_ = new ShellAuraPlatformData(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 void Shell::PlatformExit() { | 160 void Shell::PlatformExit() { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 } | 195 } |
| 196 | 196 |
| 197 void Shell::Close() { | 197 void Shell::Close() { |
| 198 web_contents_.reset(); | 198 web_contents_.reset(); |
| 199 } | 199 } |
| 200 | 200 |
| 201 void Shell::PlatformSetTitle(const base::string16& title) { | 201 void Shell::PlatformSetTitle(const base::string16& title) { |
| 202 } | 202 } |
| 203 | 203 |
| 204 } // namespace content | 204 } // namespace content |
| OLD | NEW |