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

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

Issue 376253005: Migrate the notification permission to the new common permission classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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/weak_ptr.h"
15 #include "chrome/common/chrome_version_info.h" 16 #include "chrome/common/chrome_version_info.h"
16 #include "content/public/browser/content_browser_client.h" 17 #include "content/public/browser/content_browser_client.h"
17 18
18 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
19 #include "base/memory/scoped_ptr.h" 20 #include "base/memory/scoped_ptr.h"
20 #endif 21 #endif
21 22
22 namespace base { 23 namespace base {
23 class CommandLine; 24 class CommandLine;
24 } 25 }
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 int child_process_id, 289 int child_process_id,
289 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 290 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
290 #endif 291 #endif
291 #if defined(OS_WIN) 292 #if defined(OS_WIN)
292 virtual const wchar_t* GetResourceDllName() OVERRIDE; 293 virtual const wchar_t* GetResourceDllName() OVERRIDE;
293 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 294 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
294 bool* success) OVERRIDE; 295 bool* success) OVERRIDE;
295 #endif 296 #endif
296 297
297 private: 298 private:
299 // Used as a callback once a permission has been decided.
300 // TODO(peter) remove once the notification callback returns
301 // a boolean.
302 void NotificationPermissionRequested(base::Closure callback, bool result);
Peter Beverloo 2014/07/18 10:42:38 NotificationPermissionRequested doesn't modify |th
Peter Beverloo 2014/07/18 10:42:38 const base::Closure&
Miguel Garcia 2014/07/18 12:27:08 Done.
Miguel Garcia 2014/07/18 12:27:08 Acknowledged.
303
298 #if defined(ENABLE_WEBRTC) 304 #if defined(ENABLE_WEBRTC)
299 // Copies disable WebRTC encryption switch depending on the channel. 305 // Copies disable WebRTC encryption switch depending on the channel.
300 static void MaybeCopyDisableWebRtcEncryptionSwitch( 306 static void MaybeCopyDisableWebRtcEncryptionSwitch(
301 base::CommandLine* to_command_line, 307 base::CommandLine* to_command_line,
302 const base::CommandLine& from_command_line, 308 const base::CommandLine& from_command_line,
303 VersionInfo::Channel channel); 309 VersionInfo::Channel channel);
304 #endif 310 #endif
305 311
306 void FileSystemAccessed( 312 void FileSystemAccessed(
307 const GURL& url, 313 const GURL& url,
(...skipping 29 matching lines...) Expand all
337 permissions_policy_delegate_; 343 permissions_policy_delegate_;
338 344
339 // The prerender tracker used to determine whether a render process is used 345 // The prerender tracker used to determine whether a render process is used
340 // for prerendering and an override cookie store must be provided. 346 // for prerendering and an override cookie store must be provided.
341 // This needs to be kept as a member rather than just looked up from 347 // This needs to be kept as a member rather than just looked up from
342 // the profile due to initialization ordering, as well as due to threading. 348 // the profile due to initialization ordering, as well as due to threading.
343 // It is initialized on the UI thread when the ResoureDispatcherHost is 349 // It is initialized on the UI thread when the ResoureDispatcherHost is
344 // created. It is used only the IO thread. 350 // created. It is used only the IO thread.
345 prerender::PrerenderTracker* prerender_tracker_; 351 prerender::PrerenderTracker* prerender_tracker_;
346 352
347 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 353 // TODO(peter) remove once NotificationPermissionRequested is removed.
354 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
348 355
349 friend class DisableWebRtcEncryptionFlagTest; 356 friend class DisableWebRtcEncryptionFlagTest;
350 357
351 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 358 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
352 }; 359 };
353 360
354 } // namespace chrome 361 } // namespace chrome
355 362
356 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 363 #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/chrome_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698