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/app_list/views/app_list_view.cc

Issue 266193009: Revert of Use experimental app list position whenever virtual keyboard is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « ui/app_list/views/app_list_view.h ('k') | ui/app_list/views/apps_container_view.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/app_list/views/app_list_view.h" 5 #include "ui/app_list/views/app_list_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 189
190 void AppListView::Close() { 190 void AppListView::Close() {
191 app_list_main_view_->Close(); 191 app_list_main_view_->Close();
192 delegate_->Dismiss(); 192 delegate_->Dismiss();
193 } 193 }
194 194
195 void AppListView::UpdateBounds() { 195 void AppListView::UpdateBounds() {
196 SizeToContents(); 196 SizeToContents();
197 } 197 }
198 198
199 bool AppListView::ShouldCenterWindow() const {
200 return delegate_->ShouldCenterWindow();
201 }
202
203 gfx::Size AppListView::GetPreferredSize() { 199 gfx::Size AppListView::GetPreferredSize() {
204 return app_list_main_view_->GetPreferredSize(); 200 return app_list_main_view_->GetPreferredSize();
205 } 201 }
206 202
207 void AppListView::Paint(gfx::Canvas* canvas) { 203 void AppListView::Paint(gfx::Canvas* canvas) {
208 views::BubbleDelegateView::Paint(canvas); 204 views::BubbleDelegateView::Paint(canvas);
209 if (g_next_paint_callback) { 205 if (g_next_paint_callback) {
210 g_next_paint_callback(); 206 g_next_paint_callback();
211 g_next_paint_callback = NULL; 207 g_next_paint_callback = NULL;
212 } 208 }
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 #else 510 #else
515 speech_view_->SetVisible(recognizing); 511 speech_view_->SetVisible(recognizing);
516 app_list_main_view_->SetVisible(!recognizing); 512 app_list_main_view_->SetVisible(!recognizing);
517 513
518 // Needs to schedule paint of AppListView itself, to repaint the background. 514 // Needs to schedule paint of AppListView itself, to repaint the background.
519 GetBubbleFrameView()->SchedulePaint(); 515 GetBubbleFrameView()->SchedulePaint();
520 #endif 516 #endif
521 } 517 }
522 518
523 } // namespace app_list 519 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view.h ('k') | ui/app_list/views/apps_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698