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

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

Issue 1293013002: aura: Require explicit ownership of the Env instance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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
« no previous file with comments | « content/shell/browser/shell_aura.cc ('k') | mandoline/ui/aura/aura_init.h » ('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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/context_factory.h" 9 #include "content/public/browser/context_factory.h"
10 #include "content/public/browser/render_widget_host_view.h" 10 #include "content/public/browser/render_widget_host_view.h"
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 test_screen_ = NULL; 432 test_screen_ = NULL;
433 #endif 433 #endif
434 delete views_delegate_; 434 delete views_delegate_;
435 views_delegate_ = NULL; 435 views_delegate_ = NULL;
436 delete platform_; 436 delete platform_;
437 platform_ = NULL; 437 platform_ = NULL;
438 #if defined(OS_CHROMEOS) 438 #if defined(OS_CHROMEOS)
439 device::BluetoothAdapterFactory::Shutdown(); 439 device::BluetoothAdapterFactory::Shutdown();
440 chromeos::DBusThreadManager::Shutdown(); 440 chromeos::DBusThreadManager::Shutdown();
441 #endif 441 #endif
442 aura::Env::DeleteInstance();
443 } 442 }
444 443
445 void Shell::PlatformCleanUp() { 444 void Shell::PlatformCleanUp() {
446 } 445 }
447 446
448 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { 447 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
449 if (headless_) 448 if (headless_)
450 return; 449 return;
451 ShellWindowDelegateView* delegate_view = 450 ShellWindowDelegateView* delegate_view =
452 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 451 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 const content::ContextMenuParams& params) { 547 const content::ContextMenuParams& params) {
549 if (headless_) 548 if (headless_)
550 return true; 549 return true;
551 ShellWindowDelegateView* delegate_view = 550 ShellWindowDelegateView* delegate_view =
552 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); 551 static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
553 delegate_view->ShowWebViewContextMenu(params); 552 delegate_view->ShowWebViewContextMenu(params);
554 return true; 553 return true;
555 } 554 }
556 555
557 } // namespace content 556 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_aura.cc ('k') | mandoline/ui/aura/aura_init.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698