| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| 11 | 11 |
| 12 #include <algorithm> | 12 #include <algorithm> |
| 13 #include <string> | 13 #include <string> |
| 14 | 14 |
| 15 #include "app/animation.h" | 15 #include "app/animation.h" |
| (...skipping 4081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4097 NOTREACHED(); | 4097 NOTREACHED(); |
| 4098 return false; | 4098 return false; |
| 4099 } | 4099 } |
| 4100 | 4100 |
| 4101 void Browser::CreateInstantIfNecessary() { | 4101 void Browser::CreateInstantIfNecessary() { |
| 4102 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4102 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
| 4103 !profile()->IsOffTheRecord()) { | 4103 !profile()->IsOffTheRecord()) { |
| 4104 instant_.reset(new InstantController(profile_, this)); | 4104 instant_.reset(new InstantController(profile_, this)); |
| 4105 } | 4105 } |
| 4106 } | 4106 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 5089001:
Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src