| 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/ui/browser_command_controller.h" | 5 #include "chrome/browser/ui/browser_command_controller.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 base::Unretained(this))); | 230 base::Unretained(this))); |
| 231 #endif | 231 #endif |
| 232 pref_signin_allowed_.Init( | 232 pref_signin_allowed_.Init( |
| 233 prefs::kSigninAllowed, | 233 prefs::kSigninAllowed, |
| 234 profile()->GetOriginalProfile()->GetPrefs(), | 234 profile()->GetOriginalProfile()->GetPrefs(), |
| 235 base::Bind(&BrowserCommandController::OnSigninAllowedPrefChange, | 235 base::Bind(&BrowserCommandController::OnSigninAllowedPrefChange, |
| 236 base::Unretained(this))); | 236 base::Unretained(this))); |
| 237 | 237 |
| 238 InitCommandState(); | 238 InitCommandState(); |
| 239 | 239 |
| 240 TabRestoreService* tab_restore_service = | 240 sessions::TabRestoreService* tab_restore_service = |
| 241 TabRestoreServiceFactory::GetForProfile(profile()); | 241 TabRestoreServiceFactory::GetForProfile(profile()); |
| 242 if (tab_restore_service) { | 242 if (tab_restore_service) { |
| 243 tab_restore_service->AddObserver(this); | 243 tab_restore_service->AddObserver(this); |
| 244 TabRestoreServiceChanged(tab_restore_service); | 244 TabRestoreServiceChanged(tab_restore_service); |
| 245 } | 245 } |
| 246 } | 246 } |
| 247 | 247 |
| 248 BrowserCommandController::~BrowserCommandController() { | 248 BrowserCommandController::~BrowserCommandController() { |
| 249 // TabRestoreService may have been shutdown by the time we get here. Don't | 249 // TabRestoreService may have been shutdown by the time we get here. Don't |
| 250 // trigger creating it. | 250 // trigger creating it. |
| 251 TabRestoreService* tab_restore_service = | 251 sessions::TabRestoreService* tab_restore_service = |
| 252 TabRestoreServiceFactory::GetForProfileIfExisting(profile()); | 252 TabRestoreServiceFactory::GetForProfileIfExisting(profile()); |
| 253 if (tab_restore_service) | 253 if (tab_restore_service) |
| 254 tab_restore_service->RemoveObserver(this); | 254 tab_restore_service->RemoveObserver(this); |
| 255 profile_pref_registrar_.RemoveAll(); | 255 profile_pref_registrar_.RemoveAll(); |
| 256 local_pref_registrar_.RemoveAll(); | 256 local_pref_registrar_.RemoveAll(); |
| 257 browser_->tab_strip_model()->RemoveObserver(this); | 257 browser_->tab_strip_model()->RemoveObserver(this); |
| 258 } | 258 } |
| 259 | 259 |
| 260 bool BrowserCommandController::IsReservedCommandOrKey( | 260 bool BrowserCommandController::IsReservedCommandOrKey( |
| 261 int command_id, | 261 int command_id, |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 int index) { | 820 int index) { |
| 821 PrintingStateChanged(); | 821 PrintingStateChanged(); |
| 822 FullscreenStateChanged(); | 822 FullscreenStateChanged(); |
| 823 UpdateCommandsForFind(); | 823 UpdateCommandsForFind(); |
| 824 } | 824 } |
| 825 | 825 |
| 826 //////////////////////////////////////////////////////////////////////////////// | 826 //////////////////////////////////////////////////////////////////////////////// |
| 827 // BrowserCommandController, TabRestoreServiceObserver implementation: | 827 // BrowserCommandController, TabRestoreServiceObserver implementation: |
| 828 | 828 |
| 829 void BrowserCommandController::TabRestoreServiceChanged( | 829 void BrowserCommandController::TabRestoreServiceChanged( |
| 830 TabRestoreService* service) { | 830 sessions::TabRestoreService* service) { |
| 831 UpdateTabRestoreCommandState(); | 831 UpdateTabRestoreCommandState(); |
| 832 } | 832 } |
| 833 | 833 |
| 834 void BrowserCommandController::TabRestoreServiceDestroyed( | 834 void BrowserCommandController::TabRestoreServiceDestroyed( |
| 835 TabRestoreService* service) { | 835 sessions::TabRestoreService* service) { |
| 836 service->RemoveObserver(this); | 836 service->RemoveObserver(this); |
| 837 } | 837 } |
| 838 | 838 |
| 839 void BrowserCommandController::TabRestoreServiceLoaded( | 839 void BrowserCommandController::TabRestoreServiceLoaded( |
| 840 TabRestoreService* service) { | 840 sessions::TabRestoreService* service) { |
| 841 UpdateTabRestoreCommandState(); | 841 UpdateTabRestoreCommandState(); |
| 842 } | 842 } |
| 843 | 843 |
| 844 //////////////////////////////////////////////////////////////////////////////// | 844 //////////////////////////////////////////////////////////////////////////////// |
| 845 // BrowserCommandController, private: | 845 // BrowserCommandController, private: |
| 846 | 846 |
| 847 class BrowserCommandController::InterstitialObserver | 847 class BrowserCommandController::InterstitialObserver |
| 848 : public content::WebContentsObserver { | 848 : public content::WebContentsObserver { |
| 849 public: | 849 public: |
| 850 InterstitialObserver(BrowserCommandController* controller, | 850 InterstitialObserver(BrowserCommandController* controller, |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1315 command_updater->UpdateCommandEnabled(IDC_OPEN_FILE, enabled); | 1315 command_updater->UpdateCommandEnabled(IDC_OPEN_FILE, enabled); |
| 1316 } | 1316 } |
| 1317 | 1317 |
| 1318 void BrowserCommandController::UpdateReloadStopState(bool is_loading, | 1318 void BrowserCommandController::UpdateReloadStopState(bool is_loading, |
| 1319 bool force) { | 1319 bool force) { |
| 1320 window()->UpdateReloadStopState(is_loading, force); | 1320 window()->UpdateReloadStopState(is_loading, force); |
| 1321 command_updater_.UpdateCommandEnabled(IDC_STOP, is_loading); | 1321 command_updater_.UpdateCommandEnabled(IDC_STOP, is_loading); |
| 1322 } | 1322 } |
| 1323 | 1323 |
| 1324 void BrowserCommandController::UpdateTabRestoreCommandState() { | 1324 void BrowserCommandController::UpdateTabRestoreCommandState() { |
| 1325 TabRestoreService* tab_restore_service = | 1325 sessions::TabRestoreService* tab_restore_service = |
| 1326 TabRestoreServiceFactory::GetForProfile(profile()); | 1326 TabRestoreServiceFactory::GetForProfile(profile()); |
| 1327 // The command is enabled if the service hasn't loaded yet to trigger loading. | 1327 // The command is enabled if the service hasn't loaded yet to trigger loading. |
| 1328 // The command is updated once the load completes. | 1328 // The command is updated once the load completes. |
| 1329 command_updater_.UpdateCommandEnabled( | 1329 command_updater_.UpdateCommandEnabled( |
| 1330 IDC_RESTORE_TAB, | 1330 IDC_RESTORE_TAB, |
| 1331 tab_restore_service && | 1331 tab_restore_service && |
| 1332 (!tab_restore_service->IsLoaded() || | 1332 (!tab_restore_service->IsLoaded() || |
| 1333 GetRestoreTabType(browser_) != TabStripModelDelegate::RESTORE_NONE)); | 1333 GetRestoreTabType(browser_) != TabStripModelDelegate::RESTORE_NONE)); |
| 1334 } | 1334 } |
| 1335 | 1335 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 1361 | 1361 |
| 1362 BrowserWindow* BrowserCommandController::window() { | 1362 BrowserWindow* BrowserCommandController::window() { |
| 1363 return browser_->window(); | 1363 return browser_->window(); |
| 1364 } | 1364 } |
| 1365 | 1365 |
| 1366 Profile* BrowserCommandController::profile() { | 1366 Profile* BrowserCommandController::profile() { |
| 1367 return browser_->profile(); | 1367 return browser_->profile(); |
| 1368 } | 1368 } |
| 1369 | 1369 |
| 1370 } // namespace chrome | 1370 } // namespace chrome |
| OLD | NEW |