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

Side by Side Diff: chrome/browser/ui/app_list/custom_launcher_page_contents.cc

Issue 2628883002: Move CustomLauncherPageContents from apps to c/b/ui/app_list (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « chrome/browser/ui/app_list/custom_launcher_page_contents.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 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 "apps/custom_launcher_page_contents.h" 5 #include "chrome/browser/ui/app_list/custom_launcher_page_contents.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 11 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
12 #include "content/public/browser/render_view_host.h" 12 #include "content/public/browser/render_view_host.h"
13 #include "content/public/browser/site_instance.h" 13 #include "content/public/browser/site_instance.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "content/public/common/renderer_preferences.h" 15 #include "content/public/common/renderer_preferences.h"
16 #include "extensions/browser/app_window/app_delegate.h" 16 #include "extensions/browser/app_window/app_delegate.h"
17 #include "extensions/browser/app_window/app_web_contents_helper.h" 17 #include "extensions/browser/app_window/app_web_contents_helper.h"
18 #include "extensions/browser/view_type_utils.h" 18 #include "extensions/browser/view_type_utils.h"
19 #include "extensions/common/extension_messages.h" 19 #include "extensions/common/extension_messages.h"
20 20
21 namespace apps { 21 namespace app_list {
22 22
23 CustomLauncherPageContents::CustomLauncherPageContents( 23 CustomLauncherPageContents::CustomLauncherPageContents(
24 std::unique_ptr<extensions::AppDelegate> app_delegate, 24 std::unique_ptr<extensions::AppDelegate> app_delegate,
25 const std::string& extension_id) 25 const std::string& extension_id)
26 : app_delegate_(std::move(app_delegate)), extension_id_(extension_id) {} 26 : app_delegate_(std::move(app_delegate)), extension_id_(extension_id) {}
27 27
28 CustomLauncherPageContents::~CustomLauncherPageContents() { 28 CustomLauncherPageContents::~CustomLauncherPageContents() {
29 } 29 }
30 30
31 void CustomLauncherPageContents::Initialize(content::BrowserContext* context, 31 void CustomLauncherPageContents::Initialize(content::BrowserContext* context,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 124 }
125 125
126 bool CustomLauncherPageContents::CheckMediaAccessPermission( 126 bool CustomLauncherPageContents::CheckMediaAccessPermission(
127 content::WebContents* web_contents, 127 content::WebContents* web_contents,
128 const GURL& security_origin, 128 const GURL& security_origin,
129 content::MediaStreamType type) { 129 content::MediaStreamType type) {
130 DCHECK_EQ(web_contents_.get(), web_contents); 130 DCHECK_EQ(web_contents_.get(), web_contents);
131 return helper_->CheckMediaAccessPermission(security_origin, type); 131 return helper_->CheckMediaAccessPermission(security_origin, type);
132 } 132 }
133 133
134 } // namespace apps 134 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/custom_launcher_page_contents.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698