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

Unified Diff: athena/home/home_card_impl.cc

Issue 516643005: Adds the test expectations of home card bounds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | athena/home/home_card_unittest.cc » ('j') | athena/home/home_card_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/home_card_impl.cc
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
index a6d23ccc5c3b2306b746fe70fdf9220ad42b319a..a6406fe9bfc99ccbbfb4895001a8028ef4d31de9 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -251,6 +251,7 @@ class HomeCardImpl : public HomeCard,
app_list::SearchProvider* search_provider) OVERRIDE;
virtual void UpdateVirtualKeyboardBounds(
const gfx::Rect& bounds) OVERRIDE;
+ virtual aura::Window* GetHomeCardWindowForTest() OVERRIDE;
oshima 2014/08/28 00:03:12 nit: can they be const?
Jun Mukai 2014/08/28 00:43:33 Done.
// AcceleratorHandler:
virtual bool IsCommandEnabled(int command_id) const OVERRIDE { return true; }
@@ -425,6 +426,10 @@ void HomeCardImpl::UpdateVirtualKeyboardBounds(
}
}
+aura::Window* HomeCardImpl::GetHomeCardWindowForTest() {
+ return home_card_widget_ ? home_card_widget_->GetNativeWindow() : NULL;
+}
+
bool HomeCardImpl::OnAcceleratorFired(int command_id,
const ui::Accelerator& accelerator) {
DCHECK_EQ(COMMAND_SHOW_HOME_CARD, command_id);
« no previous file with comments | « no previous file | athena/home/home_card_unittest.cc » ('j') | athena/home/home_card_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698