OLD | NEW |
---|---|
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 #include "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 | |
Ryan Tseng
2014/08/23 18:39:32
intentional change?
agable
2014/08/23 18:42:36
Yes, this was done to force the trybot to rebuild
| |
7 #include <set> | 8 #include <set> |
8 #include <string> | 9 #include <string> |
9 #include <vector> | 10 #include <vector> |
10 | 11 |
11 #include "base/at_exit.h" | 12 #include "base/at_exit.h" |
12 #include "base/bind.h" | 13 #include "base/bind.h" |
13 #include "base/command_line.h" | 14 #include "base/command_line.h" |
14 #include "base/debug/crash_logging.h" | 15 #include "base/debug/crash_logging.h" |
15 #include "base/debug/debugger.h" | 16 #include "base/debug/debugger.h" |
16 #include "base/debug/trace_event.h" | 17 #include "base/debug/trace_event.h" |
(...skipping 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1663 chromeos::CrosSettings::Shutdown(); | 1664 chromeos::CrosSettings::Shutdown(); |
1664 #endif | 1665 #endif |
1665 #endif | 1666 #endif |
1666 } | 1667 } |
1667 | 1668 |
1668 // Public members: | 1669 // Public members: |
1669 | 1670 |
1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1671 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1671 chrome_extra_parts_.push_back(parts); | 1672 chrome_extra_parts_.push_back(parts); |
1672 } | 1673 } |
OLD | NEW |