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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 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 | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_screen_win.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 (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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/client/stacking_client.h" 8 #include "ui/aura/client/stacking_client.h"
9 #include "ui/aura/focus_manager.h" 9 #include "ui/aura/focus_manager.h"
10 #include "ui/aura/root_window.h" 10 #include "ui/aura/root_window.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 void DesktopNativeWidgetAura::SetAccessibleRole( 277 void DesktopNativeWidgetAura::SetAccessibleRole(
278 ui::AccessibilityTypes::Role role) { 278 ui::AccessibilityTypes::Role role) {
279 } 279 }
280 280
281 void DesktopNativeWidgetAura::SetAccessibleState( 281 void DesktopNativeWidgetAura::SetAccessibleState(
282 ui::AccessibilityTypes::State state) { 282 ui::AccessibilityTypes::State state) {
283 } 283 }
284 284
285 void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) { 285 void DesktopNativeWidgetAura::InitModalType(ui::ModalType modal_type) {
286 // We should never be asked to create a DesktopNativeWidgetAura that is modal. 286 // 99% of the time, we should not be asked to create a
287 DCHECK_EQ(ui::MODAL_TYPE_NONE, modal_type); 287 // DesktopNativeWidgetAura that is modal. The case where this breaks down is
288 // when there are no browser windows and a background extension tries to
289 // display a simple alert dialog. (This case was masked because we used to
290 // have a hidden RootWindow which was the parent of these modal dialogs; they
291 // weren't displayed to the user.)
288 } 292 }
289 293
290 gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const { 294 gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const {
291 return desktop_root_window_host_->GetWindowBoundsInScreen(); 295 return desktop_root_window_host_->GetWindowBoundsInScreen();
292 } 296 }
293 297
294 gfx::Rect DesktopNativeWidgetAura::GetClientAreaBoundsInScreen() const { 298 gfx::Rect DesktopNativeWidgetAura::GetClientAreaBoundsInScreen() const {
295 return desktop_root_window_host_->GetClientAreaBoundsInScreen(); 299 return desktop_root_window_host_->GetClientAreaBoundsInScreen();
296 } 300 }
297 301
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 drop_helper_->OnDragExit(); 707 drop_helper_->OnDragExit();
704 } 708 }
705 709
706 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { 710 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
707 DCHECK(drop_helper_.get() != NULL); 711 DCHECK(drop_helper_.get() != NULL);
708 return drop_helper_->OnDrop(event.data(), event.location(), 712 return drop_helper_->OnDrop(event.data(), event.location(),
709 last_drop_operation_); 713 last_drop_operation_);
710 } 714 }
711 715
712 } // namespace views 716 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_screen_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698