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

Side by Side Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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
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 "ash/shell/content_client/shell_browser_main_parts.h" 5 #include "ash/shell/content_client/shell_browser_main_parts.h"
6 6
7 #include "ash/shell/shell_delegate_impl.h" 7 #include "ash/shell/shell_delegate_impl.h"
8 #include "ash/shell/window_watcher.h" 8 #include "ash/shell/window_watcher.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 ash::shell::ShellDelegateImpl* delegate = new ash::shell::ShellDelegateImpl; 86 ash::shell::ShellDelegateImpl* delegate = new ash::shell::ShellDelegateImpl;
87 ash::Shell::CreateInstance(delegate); 87 ash::Shell::CreateInstance(delegate);
88 ash::Shell::GetInstance()->set_browser_context(browser_context_.get()); 88 ash::Shell::GetInstance()->set_browser_context(browser_context_.get());
89 89
90 window_watcher_.reset(new ash::shell::WindowWatcher); 90 window_watcher_.reset(new ash::shell::WindowWatcher);
91 delegate->SetWatcher(window_watcher_.get()); 91 delegate->SetWatcher(window_watcher_.get());
92 92
93 ash::shell::InitWindowTypeLauncher(); 93 ash::shell::InitWindowTypeLauncher();
94 94
95 ash::Shell::GetRootWindow()->ShowRootWindow(); 95 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();
96 } 96 }
97 97
98 void ShellBrowserMainParts::PostMainMessageLoopRun() { 98 void ShellBrowserMainParts::PostMainMessageLoopRun() {
99 if (devtools_delegate_) 99 if (devtools_delegate_)
100 devtools_delegate_->Stop(); 100 devtools_delegate_->Stop();
101 browser_context_.reset(); 101 browser_context_.reset();
102 102
103 window_watcher_.reset(); 103 window_watcher_.reset();
104 ash::Shell::DeleteInstance(); 104 ash::Shell::DeleteInstance();
105 aura::Env::DeleteInstance(); 105 aura::Env::DeleteInstance();
106 } 106 }
107 107
108 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 108 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
109 MessageLoopForUI::current()->Run(); 109 MessageLoopForUI::current()->Run();
110 return true; 110 return true;
111 } 111 }
112 112
113 ui::Clipboard* ShellBrowserMainParts::GetClipboard() { 113 ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
114 if (!clipboard_.get()) 114 if (!clipboard_.get())
115 clipboard_.reset(new ui::Clipboard()); 115 clipboard_.reset(new ui::Clipboard());
116 return clipboard_.get(); 116 return clipboard_.get();
117 } 117 }
118 118
119 } // namespace shell 119 } // namespace shell
120 } // namespace ash 120 } // namespace ash
OLDNEW
« ash/shell.h ('K') | « ash/shell.cc ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698