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/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 |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
667 browser->window()->Show(); | 667 browser->window()->Show(); |
668 } | 668 } |
669 | 669 |
670 // static | 670 // static |
671 void Browser::OpenHelpWindow(Profile* profile) { | 671 void Browser::OpenHelpWindow(Profile* profile) { |
672 Browser* browser = Browser::Create(profile); | 672 Browser* browser = Browser::Create(profile); |
673 browser->OpenHelpTab(); | 673 browser->OpenHelpTab(); |
674 browser->window()->Show(); | 674 browser->window()->Show(); |
675 } | 675 } |
676 | 676 |
| 677 // static |
677 void Browser::OpenOptionsWindow(Profile* profile) { | 678 void Browser::OpenOptionsWindow(Profile* profile) { |
678 Browser* browser = Browser::Create(profile); | 679 Browser* browser = Browser::Create(profile); |
679 browser->ShowOptionsTab(chrome::kDefaultOptionsSubPage); | 680 browser->ShowOptionsTab(chrome::kDefaultOptionsSubPage); |
680 browser->window()->Show(); | 681 browser->window()->Show(); |
681 } | 682 } |
682 #endif | 683 #endif |
683 | 684 |
684 // static | 685 // static |
685 void Browser::OpenExtensionsWindow(Profile* profile) { | 686 void Browser::OpenExtensionsWindow(Profile* profile) { |
686 Browser* browser = Browser::Create(profile); | 687 Browser* browser = Browser::Create(profile); |
(...skipping 3407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4094 NOTREACHED(); | 4095 NOTREACHED(); |
4095 return false; | 4096 return false; |
4096 } | 4097 } |
4097 | 4098 |
4098 void Browser::CreateInstantIfNecessary() { | 4099 void Browser::CreateInstantIfNecessary() { |
4099 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4100 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
4100 !profile()->IsOffTheRecord()) { | 4101 !profile()->IsOffTheRecord()) { |
4101 instant_.reset(new InstantController(profile_, this)); | 4102 instant_.reset(new InstantController(profile_, this)); |
4102 } | 4103 } |
4103 } | 4104 } |
OLD | NEW |