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

Side by Side Diff: chromecast/browser/cast_content_window.h

Issue 823763002: Seperate creation of WebContents and window tree in CastContentWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge #ifdefs Created 6 years 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
« no previous file with comments | « no previous file | chromecast/browser/cast_content_window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROMECAST_BROWSER_CAST_CONTENT_WINDOW_H_ 5 #ifndef CHROMECAST_BROWSER_CAST_CONTENT_WINDOW_H_
6 #define CHROMECAST_BROWSER_CAST_CONTENT_WINDOW_H_ 6 #define CHROMECAST_BROWSER_CAST_CONTENT_WINDOW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 10
(...skipping 12 matching lines...) Expand all
23 23
24 namespace chromecast { 24 namespace chromecast {
25 25
26 class CastContentWindow { 26 class CastContentWindow {
27 public: 27 public:
28 CastContentWindow(); 28 CastContentWindow();
29 29
30 // Removes the window from the screen. 30 // Removes the window from the screen.
31 ~CastContentWindow(); 31 ~CastContentWindow();
32 32
33 // Create a window with the given size. 33 // Create a window with the given size for |web_contents|.
34 scoped_ptr<content::WebContents> Create( 34 void CreateWindowTree(const gfx::Size& initial_size,
35 content::WebContents* web_contents);
36
37 scoped_ptr<content::WebContents> CreateWebContents(
35 const gfx::Size& initial_size, 38 const gfx::Size& initial_size,
36 content::BrowserContext* browser_context); 39 content::BrowserContext* browser_context);
37 40
38 private: 41 private:
39 #if defined(USE_AURA) 42 #if defined(USE_AURA)
40 scoped_ptr<aura::WindowTreeHost> window_tree_host_; 43 scoped_ptr<aura::WindowTreeHost> window_tree_host_;
41 #endif 44 #endif
42 45
43 DISALLOW_COPY_AND_ASSIGN(CastContentWindow); 46 DISALLOW_COPY_AND_ASSIGN(CastContentWindow);
44 }; 47 };
45 48
46 } // namespace chromecast 49 } // namespace chromecast
47 50
48 #endif // CHROMECAST_BROWSER_CAST_CONTENT_WINDOW_H_ 51 #endif // CHROMECAST_BROWSER_CAST_CONTENT_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | chromecast/browser/cast_content_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698