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

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

Issue 10054038: Support WebView in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « content/shell/shell.h ('k') | content/shell/shell_aura.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell.h" 5 #include "content/shell/shell.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 14 matching lines...) Expand all
25 25
26 std::vector<Shell*> Shell::windows_; 26 std::vector<Shell*> Shell::windows_;
27 27
28 bool Shell::quit_message_loop_ = true; 28 bool Shell::quit_message_loop_ = true;
29 29
30 Shell::Shell(WebContents* web_contents) 30 Shell::Shell(WebContents* web_contents)
31 : WebContentsObserver(web_contents), 31 : WebContentsObserver(web_contents),
32 wait_until_done_(false), 32 wait_until_done_(false),
33 window_(NULL), 33 window_(NULL),
34 url_edit_view_(NULL) 34 url_edit_view_(NULL)
35 #if defined(OS_WIN) 35 #if defined(OS_WIN) && !defined(USE_AURA)
36 , default_edit_wnd_proc_(0) 36 , default_edit_wnd_proc_(0)
37 #endif 37 #endif
38 { 38 {
39 windows_.push_back(this); 39 windows_.push_back(this);
40 } 40 }
41 41
42 Shell::~Shell() { 42 Shell::~Shell() {
43 PlatformCleanUp(); 43 PlatformCleanUp();
44 44
45 for (size_t i = 0; i < windows_.size(); ++i) { 45 for (size_t i = 0; i < windows_.size(); ++i) {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 return; 172 return;
173 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) 173 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
174 return; 174 return;
175 RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); 175 RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
176 render_view_host->Send( 176 render_view_host->Send(
177 new ShellViewMsg_CaptureTextDump(render_view_host->GetRoutingID(), 177 new ShellViewMsg_CaptureTextDump(render_view_host->GetRoutingID(),
178 false)); 178 false));
179 } 179 }
180 180
181 } // namespace content 181 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell.h ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698