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

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

Issue 1257633002: Componentize VersionInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix lost changes to //chrome/common/BUILD.gn and fix compilation of app_window_intercept_all_keys_u… Created 5 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
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>
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 void RecordURLMetric(const std::string& metric, const GURL& url) override; 273 void RecordURLMetric(const std::string& metric, const GURL& url) override;
274 274
275 private: 275 private:
276 friend class DisableWebRtcEncryptionFlagTest; 276 friend class DisableWebRtcEncryptionFlagTest;
277 277
278 #if defined(ENABLE_WEBRTC) 278 #if defined(ENABLE_WEBRTC)
279 // Copies disable WebRTC encryption switch depending on the channel. 279 // Copies disable WebRTC encryption switch depending on the channel.
280 static void MaybeCopyDisableWebRtcEncryptionSwitch( 280 static void MaybeCopyDisableWebRtcEncryptionSwitch(
281 base::CommandLine* to_command_line, 281 base::CommandLine* to_command_line,
282 const base::CommandLine& from_command_line, 282 const base::CommandLine& from_command_line,
283 VersionInfo::Channel channel); 283 version_info::Channel channel);
284 #endif 284 #endif
285 285
286 void FileSystemAccessed( 286 void FileSystemAccessed(
287 const GURL& url, 287 const GURL& url,
288 const std::vector<std::pair<int, int> >& render_frames, 288 const std::vector<std::pair<int, int> >& render_frames,
289 base::Callback<void(bool)> callback, 289 base::Callback<void(bool)> callback,
290 bool allow); 290 bool allow);
291 291
292 #if defined(ENABLE_EXTENSIONS) 292 #if defined(ENABLE_EXTENSIONS)
293 void GuestPermissionRequestHelper( 293 void GuestPermissionRequestHelper(
(...skipping 25 matching lines...) Expand all
319 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 319 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
320 320
321 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 321 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
322 322
323 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 323 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
324 }; 324 };
325 325
326 } // namespace chrome 326 } // namespace chrome
327 327
328 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 328 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698