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

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

Issue 1871253002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot.merge Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 delete wm_test_helper_; 411 delete wm_test_helper_;
412 wm_test_helper_ = NULL; 412 wm_test_helper_ = NULL;
413 413
414 delete test_screen_; 414 delete test_screen_;
415 test_screen_ = NULL; 415 test_screen_ = NULL;
416 #endif 416 #endif
417 delete views_delegate_; 417 delete views_delegate_;
418 views_delegate_ = NULL; 418 views_delegate_ = NULL;
419 delete platform_; 419 delete platform_;
420 platform_ = NULL; 420 platform_ = NULL;
421 aura::Env::DeleteInstance();
422 } 421 }
423 422
424 void Shell::PlatformCleanUp() { 423 void Shell::PlatformCleanUp() {
425 } 424 }
426 425
427 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { 426 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
428 if (headless_) 427 if (headless_)
429 return; 428 return;
430 ShellWindowDelegateView* delegate_view = 429 ShellWindowDelegateView* delegate_view =
431 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 430 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 const content::ContextMenuParams& params) { 526 const content::ContextMenuParams& params) {
528 if (headless_) 527 if (headless_)
529 return true; 528 return true;
530 ShellWindowDelegateView* delegate_view = 529 ShellWindowDelegateView* delegate_view =
531 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 530 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
532 delegate_view->ShowWebViewContextMenu(params); 531 delegate_view->ShowWebViewContextMenu(params);
533 return true; 532 return true;
534 } 533 }
535 534
536 } // namespace content 535 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_aura.cc ('k') | headless/lib/browser/headless_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698