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

Side by Side Diff: content/shell/browser/shell_aura.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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 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 22 matching lines...) Expand all
33 } 33 }
34 34
35 virtual ~FillLayout() {} 35 virtual ~FillLayout() {}
36 36
37 private: 37 private:
38 // aura::LayoutManager: 38 // aura::LayoutManager:
39 virtual void OnWindowResized() OVERRIDE { 39 virtual void OnWindowResized() OVERRIDE {
40 } 40 }
41 41
42 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE { 42 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
43 child->SetBounds(gfx::Rect(root_->GetHostSize())); 43 child->SetBounds(gfx::Rect(root_->host()->GetBounds().size()));
44 } 44 }
45 45
46 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE { 46 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {
47 } 47 }
48 48
49 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE { 49 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {
50 } 50 }
51 51
52 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 52 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
53 bool visible) OVERRIDE { 53 bool visible) OVERRIDE {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 }; 121 };
122 122
123 } 123 }
124 124
125 ShellAuraPlatformData* Shell::platform_ = NULL; 125 ShellAuraPlatformData* Shell::platform_ = NULL;
126 126
127 ShellAuraPlatformData::ShellAuraPlatformData() { 127 ShellAuraPlatformData::ShellAuraPlatformData() {
128 aura::TestScreen* screen = aura::TestScreen::Create(); 128 aura::TestScreen* screen = aura::TestScreen::Create();
129 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen); 129 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
130 root_window_.reset(screen->CreateRootWindowForPrimaryDisplay()); 130 root_window_.reset(screen->CreateRootWindowForPrimaryDisplay());
131 root_window_->ShowRootWindow(); 131 root_window_->host()->Show();
132 root_window_->window()->SetLayoutManager(new FillLayout(root_window_.get())); 132 root_window_->window()->SetLayoutManager(new FillLayout(root_window_.get()));
133 133
134 focus_client_.reset(new aura::test::TestFocusClient()); 134 focus_client_.reset(new aura::test::TestFocusClient());
135 aura::client::SetFocusClient(root_window_->window(), focus_client_.get()); 135 aura::client::SetFocusClient(root_window_->window(), focus_client_.get());
136 136
137 activation_client_.reset( 137 activation_client_.reset(
138 new aura::client::DefaultActivationClient(root_window_->window())); 138 new aura::client::DefaultActivationClient(root_window_->window()));
139 capture_client_.reset( 139 capture_client_.reset(
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(
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 string16& title) { 201 void Shell::PlatformSetTitle(const string16& title) {
202 } 202 }
203 203
204 } // namespace content 204 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698