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

Side by Side Diff: ash/launcher/launcher.cc

Issue 9702072: Second try for (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « ash/launcher/launcher.h ('k') | ash/launcher/launcher_unittest.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 "ash/launcher/launcher.h" 5 #include "ash/launcher/launcher.h"
6 6
7 #include "ash/focus_cycler.h" 7 #include "ash/focus_cycler.h"
8 #include "ash/launcher/launcher_delegate.h" 8 #include "ash/launcher/launcher_delegate.h"
9 #include "ash/launcher/launcher_model.h" 9 #include "ash/launcher/launcher_model.h"
10 #include "ash/launcher/launcher_view.h" 10 #include "ash/launcher/launcher_view.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 return bounds; 150 return bounds;
151 151
152 gfx::Point screen_origin; 152 gfx::Point screen_origin;
153 views::View::ConvertPointToScreen(launcher_view_, &screen_origin); 153 views::View::ConvertPointToScreen(launcher_view_, &screen_origin);
154 return gfx::Rect(screen_origin.x() + bounds.x(), 154 return gfx::Rect(screen_origin.x() + bounds.x(),
155 screen_origin.y() + bounds.y(), 155 screen_origin.y() + bounds.y(),
156 bounds.width(), 156 bounds.width(),
157 bounds.height()); 157 bounds.height());
158 } 158 }
159 159
160 internal::LauncherView* Launcher::GetLauncherViewForTest() {
161 return static_cast<internal::LauncherView*>(
162 widget_->GetContentsView()->child_at(0));
163 }
160 } // namespace ash 164 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher.h ('k') | ash/launcher/launcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698