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

Side by Side Diff: ui/app_list/views/contents_view.cc

Issue 719203003: Parent the AppInfoDialog using a ModalDialogHost Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« ui/app_list/app_list.gyp ('K') | « ui/app_list/views/contents_view.h ('k') | no next file » | 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/contents_view.h" 5 #include "ui/app_list/views/contents_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "ui/app_list/app_list_constants.h" 11 #include "ui/app_list/app_list_constants.h"
12 #include "ui/app_list/app_list_switches.h" 12 #include "ui/app_list/app_list_switches.h"
13 #include "ui/app_list/app_list_view_delegate.h" 13 #include "ui/app_list/app_list_view_delegate.h"
14 #include "ui/app_list/views/app_list_folder_view.h" 14 #include "ui/app_list/views/app_list_folder_view.h"
15 #include "ui/app_list/views/app_list_main_view.h" 15 #include "ui/app_list/views/app_list_main_view.h"
16 #include "ui/app_list/views/apps_container_view.h" 16 #include "ui/app_list/views/apps_container_view.h"
17 #include "ui/app_list/views/apps_grid_view.h" 17 #include "ui/app_list/views/apps_grid_view.h"
18 #include "ui/app_list/views/contents_animator.h" 18 #include "ui/app_list/views/contents_animator.h"
19 #include "ui/app_list/views/contents_switcher_view.h" 19 #include "ui/app_list/views/contents_switcher_view.h"
20 #include "ui/app_list/views/search_box_view.h" 20 #include "ui/app_list/views/search_box_view.h"
21 #include "ui/app_list/views/search_result_list_view.h" 21 #include "ui/app_list/views/search_result_list_view.h"
22 #include "ui/app_list/views/search_result_page_view.h" 22 #include "ui/app_list/views/search_result_page_view.h"
23 #include "ui/app_list/views/start_page_view.h" 23 #include "ui/app_list/views/start_page_view.h"
24 #include "ui/events/event.h" 24 #include "ui/events/event.h"
25 #include "ui/resources/grit/ui_resources.h" 25 #include "ui/resources/grit/ui_resources.h"
26 #include "ui/views/view_model.h" 26 #include "ui/views/view_model.h"
27 #include "ui/views/view_model_utils.h" 27 #include "ui/views/view_model_utils.h"
28 #include "ui/views/widget/widget.h"
28 29
29 namespace app_list { 30 namespace app_list {
30 31
31 ContentsView::ContentsView(AppListMainView* app_list_main_view) 32 ContentsView::ContentsView(AppListMainView* app_list_main_view)
32 : apps_container_view_(nullptr), 33 : apps_container_view_(nullptr),
33 search_results_list_view_(nullptr), 34 search_results_list_view_(nullptr),
34 search_results_page_view_(nullptr), 35 search_results_page_view_(nullptr),
35 start_page_view_(nullptr), 36 start_page_view_(nullptr),
36 app_list_main_view_(app_list_main_view), 37 app_list_main_view_(app_list_main_view),
37 contents_switcher_view_(nullptr), 38 contents_switcher_view_(nullptr),
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 void ContentsView::SelectedPageChanged(int old_selected, int new_selected) { 396 void ContentsView::SelectedPageChanged(int old_selected, int new_selected) {
396 } 397 }
397 398
398 void ContentsView::TransitionStarted() { 399 void ContentsView::TransitionStarted() {
399 } 400 }
400 401
401 void ContentsView::TransitionChanged() { 402 void ContentsView::TransitionChanged() {
402 UpdatePageBounds(); 403 UpdatePageBounds();
403 } 404 }
404 405
406 gfx::NativeView ContentsView::GetHostView() const {
407 return GetWidget()->GetNativeView();
408 }
409
410 gfx::Point ContentsView::GetDialogPosition(const gfx::Size& size) {
411 gfx::Rect screen_bounds = GetBoundsInScreen();
412 return screen_bounds.origin();
413 }
414
415 void ContentsView::AddObserver(web_modal::ModalDialogHostObserver* observer) {
416 NOTIMPLEMENTED();
417 }
418
419 void ContentsView::RemoveObserver(
420 web_modal::ModalDialogHostObserver* observer) {
421 NOTIMPLEMENTED();
422 }
423
405 } // namespace app_list 424 } // namespace app_list
OLDNEW
« ui/app_list/app_list.gyp ('K') | « ui/app_list/views/contents_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698