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

Side by Side Diff: chrome/app/chrome_main_delegate.h

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_APP_CHROME_MAIN_DELEGATE_H_ 5 #ifndef CHROME_APP_CHROME_MAIN_DELEGATE_H_
6 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_ 6 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "build/build_config.h" 11 #include "build/build_config.h"
11 #include "chrome/common/chrome_content_client.h" 12 #include "chrome/common/chrome_content_client.h"
12 #include "content/public/app/content_main_delegate.h" 13 #include "content/public/app/content_main_delegate.h"
13 14
14 template <typename> 15 template <typename>
15 class ScopedVector; 16 class ScopedVector;
16 17
17 namespace base { 18 namespace base {
18 class CommandLine; 19 class CommandLine;
19 } 20 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void InitMacCrashReporter(const base::CommandLine& command_line, 55 void InitMacCrashReporter(const base::CommandLine& command_line,
55 const std::string& process_type); 56 const std::string& process_type);
56 #endif // defined(OS_MACOSX) 57 #endif // defined(OS_MACOSX)
57 58
58 ChromeContentClient chrome_content_client_; 59 ChromeContentClient chrome_content_client_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate); 61 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);
61 }; 62 };
62 63
63 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_ 64 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698