athena/content/web_activity.cc - Issue 735473002: Rename app_modal_dialogs dir to app_modal

Side by Side Diff: athena/content/web_activity.cc

Issue 735473002: Rename app_modal_dialogs dir to app_modal (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: rebase 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

« no previous file with comments | « athena/content/DEPS ('k') | athena/extensions/DEPS » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "athena/content/web_activity.h"	5 #include "athena/content/web_activity.h"

6	6

7 #include "athena/activity/public/activity_factory.h"	7 #include "athena/activity/public/activity_factory.h"

8 #include "athena/activity/public/activity_manager.h"	8 #include "athena/activity/public/activity_manager.h"

9 #include "athena/activity/public/activity_view.h"	9 #include "athena/activity/public/activity_view.h"

10 #include "athena/content/content_proxy.h"	10 #include "athena/content/content_proxy.h"

11 #include "athena/content/media_utils.h"	11 #include "athena/content/media_utils.h"

12 #include "athena/content/public/dialogs.h"	12 #include "athena/content/public/dialogs.h"

13 #include "athena/content/web_activity_helpers.h"	13 #include "athena/content/web_activity_helpers.h"

14 #include "athena/input/public/accelerator_manager.h"	14 #include "athena/input/public/accelerator_manager.h"

15 #include "athena/strings/grit/athena_strings.h"	15 #include "athena/strings/grit/athena_strings.h"

16 #include "base/bind.h"	16 #include "base/bind.h"

17 #include "base/command_line.h"	17 #include "base/command_line.h"

18 #include "base/strings/utf_string_conversions.h"	18 #include "base/strings/utf_string_conversions.h"

19 #include "components/app_modal_dialogs/javascript_dialog_manager.h"	19 #include "components/app_modal/javascript_dialog_manager.h"

20 #include "components/favicon_base/select_favicon_frames.h"	20 #include "components/favicon_base/select_favicon_frames.h"

21 #include "content/public/browser/native_web_keyboard_event.h"	21 #include "content/public/browser/native_web_keyboard_event.h"

22 #include "content/public/browser/navigation_controller.h"	22 #include "content/public/browser/navigation_controller.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

24 #include "content/public/browser/web_contents_delegate.h"	24 #include "content/public/browser/web_contents_delegate.h"

25 #include "content/public/common/content_switches.h"	25 #include "content/public/common/content_switches.h"

26 #include "content/public/common/favicon_url.h"	26 #include "content/public/common/favicon_url.h"

27 #include "ui/aura/window.h"	27 #include "ui/aura/window.h"

28 #include "ui/base/l10n/l10n_util.h"	28 #include "ui/base/l10n/l10n_util.h"

29 #include "ui/compositor/closure_animation_observer.h"	29 #include "ui/compositor/closure_animation_observer.h"

(...skipping 623 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
653 if (content_proxy_.get())	653 if (content_proxy_.get())

654 content_proxy_.reset(nullptr);	654 content_proxy_.reset(nullptr);

655 }	655 }

656	656

657 void WebActivity::ShowContentProxy() {	657 void WebActivity::ShowContentProxy() {

658 if (!content_proxy_.get())	658 if (!content_proxy_.get())

659 content_proxy_.reset(new ContentProxy(web_view_));	659 content_proxy_.reset(new ContentProxy(web_view_));

660 }	660 }

661	661

662 } // namespace athena	662 } // namespace athena

OLD	NEW