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

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 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 | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_content_browser_client.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 #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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "content/public/browser/content_browser_client.h" 19 #include "content/public/browser/content_browser_client.h"
20 #include "extensions/features/features.h"
20 21
21 class ChromeContentBrowserClientParts; 22 class ChromeContentBrowserClientParts;
22 23
23 namespace base { 24 namespace base {
24 class CommandLine; 25 class CommandLine;
25 } 26 }
26 27
27 namespace content { 28 namespace content {
28 class BrowserContext; 29 class BrowserContext;
29 class QuotaPermissionContext; 30 class QuotaPermissionContext;
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 const base::CommandLine& from_command_line, 320 const base::CommandLine& from_command_line,
320 version_info::Channel channel); 321 version_info::Channel channel);
321 #endif 322 #endif
322 323
323 void FileSystemAccessed( 324 void FileSystemAccessed(
324 const GURL& url, 325 const GURL& url,
325 const std::vector<std::pair<int, int> >& render_frames, 326 const std::vector<std::pair<int, int> >& render_frames,
326 base::Callback<void(bool)> callback, 327 base::Callback<void(bool)> callback,
327 bool allow); 328 bool allow);
328 329
329 #if defined(ENABLE_EXTENSIONS) 330 #if BUILDFLAG(ENABLE_EXTENSIONS)
330 void GuestPermissionRequestHelper( 331 void GuestPermissionRequestHelper(
331 const GURL& url, 332 const GURL& url,
332 const std::vector<std::pair<int, int> >& render_frames, 333 const std::vector<std::pair<int, int> >& render_frames,
333 base::Callback<void(bool)> callback, 334 base::Callback<void(bool)> callback,
334 bool allow); 335 bool allow);
335 336
336 static void RequestFileSystemPermissionOnUIThread( 337 static void RequestFileSystemPermissionOnUIThread(
337 int render_process_id, 338 int render_process_id,
338 int render_frame_id, 339 int render_frame_id,
339 const GURL& url, 340 const GURL& url,
(...skipping 14 matching lines...) Expand all
354 // Vector of additional ChromeContentBrowserClientParts. 355 // Vector of additional ChromeContentBrowserClientParts.
355 // Parts are deleted in the reverse order they are added. 356 // Parts are deleted in the reverse order they are added.
356 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 357 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
357 358
358 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 359 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
359 360
360 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 361 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
361 }; 362 };
362 363
363 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 364 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698