| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.
h" | 5 #include "chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.
h" |
| 6 | 6 |
| 7 #include "athena/extensions/public/extensions_delegate.h" | 7 #include "athena/extensions/public/extensions_delegate.h" |
| 8 #include "athena/main/athena_launcher.h" | 8 #include "athena/main/public/athena_launcher.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts { | 18 class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 private: | 37 private: |
| 38 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAthena); | 38 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAthena); |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 } // namespace | 41 } // namespace |
| 42 | 42 |
| 43 ChromeBrowserMainExtraParts* CreateChromeBrowserMainExtraPartsAthena() { | 43 ChromeBrowserMainExtraParts* CreateChromeBrowserMainExtraPartsAthena() { |
| 44 return new ChromeBrowserMainExtraPartsAthena(); | 44 return new ChromeBrowserMainExtraPartsAthena(); |
| 45 } | 45 } |
| OLD | NEW |