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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 444113003: Remove dependency of chrome in GuestViewBase. (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 unified diff | Download patch
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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "chrome/common/chrome_version_info.h" 17 #include "chrome/common/chrome_version_info.h"
18 #include "content/public/browser/content_browser_client.h" 18 #include "content/public/browser/content_browser_client.h"
19 19
20 class ChromeContentBrowserClientParts; 20 class ChromeContentBrowserClientParts;
21 struct RendererContentSettingRules;
21 22
22 namespace base { 23 namespace base {
23 class CommandLine; 24 class CommandLine;
24 } 25 }
25 26
26 namespace content { 27 namespace content {
27 class QuotaPermissionContext; 28 class QuotaPermissionContext;
28 } 29 }
29 30
30 namespace extensions { 31 namespace extensions {
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 const std::vector<std::pair<int, int> >& render_frames, 322 const std::vector<std::pair<int, int> >& render_frames,
322 base::Callback<void(bool)> callback, 323 base::Callback<void(bool)> callback,
323 bool allow); 324 bool allow);
324 325
325 static void RequestFileSystemPermissionOnUIThread( 326 static void RequestFileSystemPermissionOnUIThread(
326 int render_process_id, 327 int render_process_id,
327 int render_frame_id, 328 int render_frame_id,
328 const GURL& url, 329 const GURL& url,
329 bool allowed_by_default, 330 bool allowed_by_default,
330 const base::Callback<void(bool)>& callback); 331 const base::Callback<void(bool)>& callback);
332
333 // By default, JavaScript and images are enabled in guest content.
334 static void GetGuestViewDefaultContentSettingRules(
Fady Samuel 2014/08/07 20:10:48 This probably doesn't need to be here at all. You
Xi Han 2014/08/07 20:36:07 Done.
335 bool incognito,
336 RendererContentSettingRules* rules);
331 #endif 337 #endif
332 338
333 #if defined(ENABLE_PLUGINS) 339 #if defined(ENABLE_PLUGINS)
334 // Set of origins that can use TCP/UDP private APIs from NaCl. 340 // Set of origins that can use TCP/UDP private APIs from NaCl.
335 std::set<std::string> allowed_socket_origins_; 341 std::set<std::string> allowed_socket_origins_;
336 // Set of origins that can get a handle for FileIO from NaCl. 342 // Set of origins that can get a handle for FileIO from NaCl.
337 std::set<std::string> allowed_file_handle_origins_; 343 std::set<std::string> allowed_file_handle_origins_;
338 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 344 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
339 // versions of Chrome. 345 // versions of Chrome.
340 std::set<std::string> allowed_dev_channel_origins_; 346 std::set<std::string> allowed_dev_channel_origins_;
(...skipping 12 matching lines...) Expand all
353 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 359 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
354 360
355 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 361 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
356 362
357 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 363 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
358 }; 364 };
359 365
360 } // namespace chrome 366 } // namespace chrome
361 367
362 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 368 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/guest_view/guest_view_base.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698