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

Side by Side Diff: ui/aura_shell/shell.cc

Issue 8949010: Rename WindowDragDropDelegate->DragDropDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « ui/aura_shell/drag_drop_controller_unittest.cc ('k') | ui/views/widget/native_widget_aura.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/shell.h" 5 #include "ui/aura_shell/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 // Initialize ShellTooltipManager 212 // Initialize ShellTooltipManager
213 tooltip_manager_.reset(new ShellTooltipManager); 213 tooltip_manager_.reset(new ShellTooltipManager);
214 aura::RootWindow::GetInstance()->SetProperty( 214 aura::RootWindow::GetInstance()->SetProperty(
215 aura::kRootWindowTooltipClientKey, 215 aura::kRootWindowTooltipClientKey,
216 static_cast<aura::TooltipClient*>(tooltip_manager_.get())); 216 static_cast<aura::TooltipClient*>(tooltip_manager_.get()));
217 AddRootWindowEventFilter(tooltip_manager_.get()); 217 AddRootWindowEventFilter(tooltip_manager_.get());
218 218
219 // Initialize drag drop controller. 219 // Initialize drag drop controller.
220 drag_drop_controller_.reset(new internal::DragDropController); 220 drag_drop_controller_.reset(new internal::DragDropController);
221 aura::RootWindow::GetInstance()->SetProperty(
222 aura::kRootWindowDragDropClientKey,
223 static_cast<aura::DragDropClient*>(drag_drop_controller_.get()));
224 } 221 }
225 222
226 void Shell::InitLayoutManagers(aura::RootWindow* root_window) { 223 void Shell::InitLayoutManagers(aura::RootWindow* root_window) {
227 internal::RootWindowLayoutManager* root_window_layout = 224 internal::RootWindowLayoutManager* root_window_layout =
228 new internal::RootWindowLayoutManager(root_window); 225 new internal::RootWindowLayoutManager(root_window);
229 root_window->SetLayoutManager(root_window_layout); 226 root_window->SetLayoutManager(root_window_layout);
230 227
231 views::Widget* status_widget = NULL; 228 views::Widget* status_widget = NULL;
232 if (delegate_.get()) 229 if (delegate_.get())
233 status_widget = delegate_->CreateStatusArea(); 230 status_widget = delegate_->CreateStatusArea();
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 new internal::WorkspaceController(default_container)); 327 new internal::WorkspaceController(default_container));
331 workspace_controller_->SetLauncherModel(launcher_->model()); 328 workspace_controller_->SetLauncherModel(launcher_->model());
332 default_container->SetEventFilter( 329 default_container->SetEventFilter(
333 new internal::DefaultContainerEventFilter(default_container)); 330 new internal::DefaultContainerEventFilter(default_container));
334 default_container->SetLayoutManager( 331 default_container->SetLayoutManager(
335 new internal::DefaultContainerLayoutManager( 332 new internal::DefaultContainerLayoutManager(
336 workspace_controller_->workspace_manager())); 333 workspace_controller_->workspace_manager()));
337 } 334 }
338 335
339 } // namespace aura_shell 336 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/drag_drop_controller_unittest.cc ('k') | ui/views/widget/native_widget_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698