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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months 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_platform_data_aura.h" 9 #include "content/shell/browser/shell_platform_data_aura.h"
10 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
11 #include "ui/aura/root_window.h"
12 #include "ui/aura/test/test_screen.h" 11 #include "ui/aura/test/test_screen.h"
13 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_event_dispatcher.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 // static 17 // static
18 void Shell::PlatformInitialize(const gfx::Size& default_window_size) { 18 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
19 CHECK(!platform_); 19 CHECK(!platform_);
20 aura::TestScreen* screen = aura::TestScreen::Create(); 20 aura::TestScreen* screen = aura::TestScreen::Create();
21 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen); 21 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
22 platform_ = new ShellPlatformDataAura(default_window_size); 22 platform_ = new ShellPlatformDataAura(default_window_size);
23 } 23 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 void Shell::PlatformSetTitle(const base::string16& title) { 68 void Shell::PlatformSetTitle(const base::string16& title) {
69 } 69 }
70 70
71 bool Shell::PlatformHandleContextMenu( 71 bool Shell::PlatformHandleContextMenu(
72 const content::ContextMenuParams& params) { 72 const content::ContextMenuParams& params) {
73 return false; 73 return false;
74 } 74 }
75 75
76 } // namespace content 76 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698