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

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

Issue 137993009: Remove more non-aura windows code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: renable the disabled tests Created 6 years, 11 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/browser/shell.h ('k') | content/shell/browser/shell_download_manager_delegate.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 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 "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/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 DISALLOW_COPY_AND_ASSIGN(DevToolsWebContentsObserver); 61 DISALLOW_COPY_AND_ASSIGN(DevToolsWebContentsObserver);
62 }; 62 };
63 63
64 Shell::Shell(WebContents* web_contents) 64 Shell::Shell(WebContents* web_contents)
65 : WebContentsObserver(web_contents), 65 : WebContentsObserver(web_contents),
66 devtools_frontend_(NULL), 66 devtools_frontend_(NULL),
67 is_fullscreen_(false), 67 is_fullscreen_(false),
68 window_(NULL), 68 window_(NULL),
69 url_edit_view_(NULL), 69 url_edit_view_(NULL),
70 #if defined(OS_WIN) && !defined(USE_AURA)
71 default_edit_wnd_proc_(0),
72 #endif
73 headless_(false) { 70 headless_(false) {
74 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 71 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
75 if (command_line.HasSwitch(switches::kDumpRenderTree)) 72 if (command_line.HasSwitch(switches::kDumpRenderTree))
76 headless_ = true; 73 headless_ = true;
77 windows_.push_back(this); 74 windows_.push_back(this);
78 75
79 if (!shell_created_callback_.is_null()) { 76 if (!shell_created_callback_.is_null()) {
80 shell_created_callback_.Run(this); 77 shell_created_callback_.Run(this);
81 shell_created_callback_.Reset(); 78 shell_created_callback_.Reset();
82 } 79 }
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 if (entry) 350 if (entry)
354 PlatformSetTitle(entry->GetTitle()); 351 PlatformSetTitle(entry->GetTitle());
355 } 352 }
356 353
357 void Shell::OnDevToolsWebContentsDestroyed() { 354 void Shell::OnDevToolsWebContentsDestroyed() {
358 devtools_observer_.reset(); 355 devtools_observer_.reset();
359 devtools_frontend_ = NULL; 356 devtools_frontend_ = NULL;
360 } 357 }
361 358
362 } // namespace content 359 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell.h ('k') | content/shell/browser/shell_download_manager_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698