diff options
58 files changed, 112 insertions, 103 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 1bc8cc6..f51da7a 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -1065,7 +1065,7 @@ void LauncherView::ShowContextMenuForView(views::View* source, source->GetWidget()->GetNativeView()->GetRootWindow())); if (!menu_model.get()) return; - AutoReset<LauncherID> reseter( + base::AutoReset<LauncherID> reseter( &context_menu_id_, view_index == -1 ? 0 : model_->items()[view_index].id); views::MenuModelAdapter menu_model_adapter(menu_model.get()); diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc index db786c8..0861ce0 100644 --- a/ash/wm/activation_controller.cc +++ b/ash/wm/activation_controller.cc @@ -296,7 +296,7 @@ void ActivationController::ActivateWindowWithEvent(aura::Window* window, // Prevent recursion when called from focus. if (updating_activation_) return; - AutoReset<bool> in_activate_window(&updating_activation_, true); + base::AutoReset<bool> in_activate_window(&updating_activation_, true); // We allow the delegate to change which window gets activated, or to prevent // activation changes. diff --git a/ash/wm/panel_layout_manager.cc b/ash/wm/panel_layout_manager.cc index e1f600f..bddf55d 100644 --- a/ash/wm/panel_layout_manager.cc +++ b/ash/wm/panel_layout_manager.cc @@ -248,7 +248,7 @@ void PanelLayoutManager::Relayout() { if (in_layout_) return; - AutoReset<bool> auto_reset_in_layout(&in_layout_, true); + base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); int launcher_top = launcher_->widget()->GetWindowBoundsInScreen().y(); aura::Window* active_panel = NULL; diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index faf784c..4df054d 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -230,7 +230,7 @@ gfx::Rect ShelfLayoutManager::GetIdealBounds() { } void ShelfLayoutManager::LayoutShelf() { - AutoReset<bool> auto_reset_in_layout(&in_layout_, true); + base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); StopAnimating(); TargetBounds target_bounds; CalculateTargetBounds(state_, &target_bounds); diff --git a/ash/wm/status_area_layout_manager.cc b/ash/wm/status_area_layout_manager.cc index b971d79..df37969 100644 --- a/ash/wm/status_area_layout_manager.cc +++ b/ash/wm/status_area_layout_manager.cc @@ -72,7 +72,7 @@ void StatusAreaLayoutManager::LayoutStatusArea() { if (shelf_->in_layout()) return; - AutoReset<bool> auto_reset_in_layout(&in_layout_, true); + base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); shelf_->LayoutShelf(); } diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc index 2ac3793..af598e8 100644 --- a/ash/wm/workspace/workspace_manager.cc +++ b/ash/wm/workspace/workspace_manager.cc @@ -384,7 +384,7 @@ void WorkspaceManager::MoveWorkspaceToPendingOrDelete( if (workspace == active_workspace_) SelectNextWorkspace(reason); - AutoReset<bool> setter(&in_move_, true); + base::AutoReset<bool> setter(&in_move_, true); MoveChildrenToDesktop(workspace->window(), stack_beneath); @@ -470,7 +470,7 @@ void WorkspaceManager::FadeDesktop(aura::Window* window, ui::LayerAnimator::disable_animations_for_test()) return; - AutoReset<bool> reseter(&creating_fade_, true); + base::AutoReset<bool> reseter(&creating_fade_, true); DesktopBackgroundFadeController::Direction direction; aura::Window* parent = NULL; aura::Window* stack_above = NULL; @@ -674,7 +674,7 @@ void WorkspaceManager::OnWorkspaceWindowShowStateChanged( if (max_count == 0) { if (workspace != desktop_workspace()) { { - AutoReset<bool> setter(&in_move_, true); + base::AutoReset<bool> setter(&in_move_, true); ReparentWindow(child, desktop_workspace()->window(), NULL); } DCHECK(!is_active || old_layer); diff --git a/base/auto_reset.h b/base/auto_reset.h index 86b60cbd..32f138e 100644 --- a/base/auto_reset.h +++ b/base/auto_reset.h @@ -7,14 +7,16 @@ #include "base/basictypes.h" -// AutoReset<> is useful for setting a variable to a new value only within a -// particular scope. An AutoReset<> object resets a variable to its original -// value upon destruction, making it an alternative to writing "var = false;" -// or "var = old_val;" at all of a block's exit points. +// base::AutoReset<> is useful for setting a variable to a new value only within +// a particular scope. An base::AutoReset<> object resets a variable to its +// original value upon destruction, making it an alternative to writing +// "var = false;" or "var = old_val;" at all of a block's exit points. // -// This should be obvious, but note that an AutoReset<> instance should have a -// shorter lifetime than its scoped_variable, to prevent invalid memory writes -// when the AutoReset<> object is destroyed. +// This should be obvious, but note that an base::AutoReset<> instance should +// have a shorter lifetime than its scoped_variable, to prevent invalid memory +// writes when the base::AutoReset<> object is destroyed. + +namespace base { template<typename T> class AutoReset { @@ -34,4 +36,6 @@ class AutoReset { DISALLOW_COPY_AND_ASSIGN(AutoReset); }; +} + #endif // BASE_AUTO_RESET_H_ diff --git a/base/message_pump_libevent.cc b/base/message_pump_libevent.cc index 45e1bdb..66acd86 100644 --- a/base/message_pump_libevent.cc +++ b/base/message_pump_libevent.cc @@ -225,7 +225,7 @@ static void timer_callback(int fd, short events, void *context) // Reentrant! void MessagePumpLibevent::Run(Delegate* delegate) { DCHECK(keep_running_) << "Quit must have been called outside of Run!"; - AutoReset<bool> auto_reset_in_run(&in_run_, true); + base::AutoReset<bool> auto_reset_in_run(&in_run_, true); // event_base_loopexit() + EVLOOP_ONCE is leaky, see http://crbug.com/25641. // Instead, make our own timer and reuse it on each call to event_base_loop(). diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index 383dacf..373d4cf 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -567,7 +567,7 @@ class ScopedClearErrno { }; // Combines ThreadLocalBoolean with AutoReset. It would be convenient -// to compose ThreadLocalPointer<bool> with AutoReset<bool>, but that +// to compose ThreadLocalPointer<bool> with base::AutoReset<bool>, but that // would require allocating some storage for the bool. class ThreadLocalBooleanAutoReset { public: diff --git a/base/test/mock_chrome_application_mac.mm b/base/test/mock_chrome_application_mac.mm index 9135293..0890553 100644 --- a/base/test/mock_chrome_application_mac.mm +++ b/base/test/mock_chrome_application_mac.mm @@ -21,7 +21,7 @@ } - (void)sendEvent:(NSEvent*)event { - AutoReset<BOOL> scoper(&handlingSendEvent_, YES); + base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES); [super sendEvent:event]; } diff --git a/cc/scheduler.cc b/cc/scheduler.cc index ecbed8d..ed2884f 100644 --- a/cc/scheduler.cc +++ b/cc/scheduler.cc @@ -146,7 +146,7 @@ void Scheduler::processScheduledActions() if (m_insideProcessScheduledActions) return; - AutoReset<bool> markInside(&m_insideProcessScheduledActions, true); + base::AutoReset<bool> markInside(&m_insideProcessScheduledActions, true); SchedulerStateMachine::Action action = m_stateMachine.nextAction(); while (action != SchedulerStateMachine::ACTION_NONE) { diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index 50cd89a..111a5fa 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -70,7 +70,7 @@ bool FatalMessageHandler(int severity, const char* file, int line, if (guarded) return false; - AutoReset<bool> guard(&guarded, true); + base::AutoReset<bool> guard(&guarded, true); // Only log last path component. This matches logging.cc. if (file) { diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index f9e4df1..c293aec 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -113,7 +113,7 @@ Browser* ActivateBrowser(Profile* profile) { // to the new |Browser|. Browser* CreateBrowser(Profile* profile) { { - AutoReset<bool> auto_reset_in_run(&g_is_opening_new_window, true); + base::AutoReset<bool> auto_reset_in_run(&g_is_opening_new_window, true); chrome::NewEmptyWindow(profile); } @@ -974,7 +974,7 @@ void RecordLastRunAppBundlePath() { // Otherwise open a new window. { - AutoReset<bool> auto_reset_in_run(&g_is_opening_new_window, true); + base::AutoReset<bool> auto_reset_in_run(&g_is_opening_new_window, true); int return_code; StartupBrowserCreator browser_creator; browser_creator.LaunchBrowser( diff --git a/chrome/browser/autocomplete/autocomplete_classifier.cc b/chrome/browser/autocomplete/autocomplete_classifier.cc index a857ac3..f877f7b 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier.cc +++ b/chrome/browser/autocomplete/autocomplete_classifier.cc @@ -51,7 +51,7 @@ void AutocompleteClassifier::Classify(const string16& text, AutocompleteMatch* match, GURL* alternate_nav_url) { DCHECK(!inside_classify_); - AutoReset<bool> reset(&inside_classify_, true); + base::AutoReset<bool> reset(&inside_classify_, true); controller_->Start(text, desired_tld, true, prefer_keyword, allow_exact_keyword_match, AutocompleteInput::BEST_MATCH); DCHECK(controller_->done()); diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm index 771790b..1990e21 100644 --- a/chrome/browser/chrome_browser_application_mac.mm +++ b/chrome/browser/chrome_browser_application_mac.mm @@ -518,7 +518,7 @@ void SwizzleInit() { } - (void)_cycleWindowsReversed:(BOOL)arg1 { - AutoReset<BOOL> pin(&cyclingWindows_, YES); + base::AutoReset<BOOL> pin(&cyclingWindows_, YES); [super _cycleWindowsReversed:arg1]; } diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index 2ff3945..b31a6e7 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -188,7 +188,7 @@ bool DefaultProvider::SetWebsiteSetting( // properly if we don't pass on the ownership. scoped_ptr<base::Value> value(in_value); { - AutoReset<bool> auto_reset(&updating_preferences_, true); + base::AutoReset<bool> auto_reset(&updating_preferences_, true); // |DefaultProvider| should not send any notifications when holding // |lock_|. |DictionaryPrefUpdate| destructor and diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index eb6135f..7f500fa 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -248,7 +248,7 @@ void PrefProvider::UpdatePref( // send out notifications (by |~DictionaryPrefUpdate|). AssertLockNotHeld(); - AutoReset<bool> auto_reset(&updating_preferences_, true); + base::AutoReset<bool> auto_reset(&updating_preferences_, true); { DictionaryPrefUpdate update(prefs_, prefs::kContentSettingsPatternPairs); @@ -268,7 +268,7 @@ void PrefProvider::ReadContentSettingsFromPref(bool overwrite) { // not held when the notifications are sent. Also, |auto_reset| must be still // valid when the notifications are sent, so that |Observe| skips the // notification. - AutoReset<bool> auto_reset(&updating_preferences_, true); + base::AutoReset<bool> auto_reset(&updating_preferences_, true); DictionaryPrefUpdate update(prefs_, prefs::kContentSettingsPatternPairs); base::AutoLock auto_lock(lock_); diff --git a/chrome/browser/content_settings/cookie_settings_unittest.cc b/chrome/browser/content_settings/cookie_settings_unittest.cc index b638f61..68b0197 100644 --- a/chrome/browser/content_settings/cookie_settings_unittest.cc +++ b/chrome/browser/content_settings/cookie_settings_unittest.cc @@ -66,7 +66,7 @@ TEST_F(CookieSettingsTest, CookiesBlockThirdParty) { kBlockedSite, kFirstPartySite)); CommandLine* cmd = CommandLine::ForCurrentProcess(); - AutoReset<CommandLine> auto_reset(cmd, *cmd); + base::AutoReset<CommandLine> auto_reset(cmd, *cmd); cmd->AppendSwitch(switches::kOnlyBlockSettingThirdPartyCookies); EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed( diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index 7e74ec0..3c470c7 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -724,7 +724,7 @@ TEST_F(HostContentSettingsMapTest, CanonicalizeExceptionsUnicodeAndPunycode) { TEST_F(HostContentSettingsMapTest, ResourceIdentifier) { // This feature is currently behind a flag. CommandLine* cmd = CommandLine::ForCurrentProcess(); - AutoReset<CommandLine> auto_reset(cmd, *cmd); + base::AutoReset<CommandLine> auto_reset(cmd, *cmd); cmd->AppendSwitch(switches::kEnableResourceContentSettings); TestingProfile profile; @@ -769,7 +769,7 @@ TEST_F(HostContentSettingsMapTest, ResourceIdentifier) { TEST_F(HostContentSettingsMapTest, ResourceIdentifierPrefs) { // This feature is currently behind a flag. CommandLine* cmd = CommandLine::ForCurrentProcess(); - AutoReset<CommandLine> auto_reset(cmd, *cmd); + base::AutoReset<CommandLine> auto_reset(cmd, *cmd); cmd->AppendSwitch(switches::kEnableResourceContentSettings); TestingProfile profile; diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc index 2d8cfcf..25bdfb8 100644 --- a/chrome/browser/extensions/app_notification_manager.cc +++ b/chrome/browser/extensions/app_notification_manager.cc @@ -215,7 +215,7 @@ syncer::SyncError AppNotificationManager::ProcessSyncChanges( "Models not yet associated."); } - AutoReset<bool> processing_changes(&processing_syncer_changes_, true); + base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true); syncer::SyncError error; for (syncer::SyncChangeList::const_iterator iter = change_list.begin(); @@ -305,7 +305,7 @@ syncer::SyncMergeResult AppNotificationManager::MergeDataAndStartSyncing( // We may add, or remove notifications here, so ensure we don't step on // our own toes. - AutoReset<bool> processing_changes(&processing_syncer_changes_, true); + base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true); SyncDataMap local_data_map; PopulateGuidToSyncDataMap(GetAllSyncData(syncer::APP_NOTIFICATIONS), diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm index 3b454c7..40a608d 100644 --- a/chrome/browser/mac/install_from_dmg.mm +++ b/chrome/browser/mac/install_from_dmg.mm @@ -564,7 +564,7 @@ bool SynchronousDAOperation(const char* name, // avoid spinning the run loop at all. if (!callback_data->callback_called) { const CFTimeInterval kOperationTimeoutSeconds = 15; - AutoReset<bool> running_reset(&callback_data->run_loop_running, true); + base::AutoReset<bool> running_reset(&callback_data->run_loop_running, true); CFRunLoopRunInMode(kCFRunLoopDefaultMode, kOperationTimeoutSeconds, FALSE); } diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc index 5da0b9a..b785459 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc @@ -195,7 +195,7 @@ class AutocompleteActionPredictorTest : public testing::Test { // Reset the predictor's |initialized_| flag for the life of this call, // since outside of testing this function is only supposed to be reached // before initialization is completed. - AutoReset<bool> initialized_reset(&predictor_->initialized_, false); + base::AutoReset<bool> initialized_reset(&predictor_->initialized_, false); predictor_->DeleteOldIdsFromCaches(url_db, id_list); } diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc index 39643bb..ac96bf1 100644 --- a/chrome/browser/prefs/pref_model_associator.cc +++ b/chrome/browser/prefs/pref_model_associator.cc @@ -316,7 +316,7 @@ syncer::SyncError PrefModelAssociator::ProcessSyncChanges( PREFERENCES); return error; } - AutoReset<bool> processing_changes(&processing_syncer_changes_, true); + base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true); syncer::SyncChangeList::const_iterator iter; for (iter = change_list.begin(); iter != change_list.end(); ++iter) { DCHECK_EQ(PREFERENCES, iter->sync_data().GetDataType()); @@ -424,7 +424,7 @@ void PrefModelAssociator::ProcessPrefChange(const std::string& name) { return; } - AutoReset<bool> processing_changes(&processing_syncer_changes_, true); + base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true); if (synced_preferences_.count(name) == 0) { // Not in synced_preferences_ means no synced data. InitPrefAndAssociate(..) diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc index 63da491..01d15402 100644 --- a/chrome/browser/printing/print_preview_tab_controller.cc +++ b/chrome/browser/printing/print_preview_tab_controller.cc @@ -414,7 +414,7 @@ void PrintPreviewTabController::OnNavEntryCommitted( TabContents* PrintPreviewTabController::CreatePrintPreviewTab( TabContents* initiator_tab) { - AutoReset<bool> auto_reset(&is_creating_print_preview_tab_, true); + base::AutoReset<bool> auto_reset(&is_creating_print_preview_tab_, true); WebContents* web_contents = initiator_tab->web_contents(); Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index e10e5b8..5ca0d7f 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -935,7 +935,7 @@ void TemplateURLService::OnPreferenceChanged(PrefServiceBase* service, prefs->GetString(prefs::kSyncedDefaultSearchProviderGUID)); if (new_default_search && !is_default_search_managed_) { if (new_default_search != GetDefaultSearchProvider()) { - AutoReset<DefaultSearchChangeOrigin> change_origin( + base::AutoReset<DefaultSearchChangeOrigin> change_origin( &dsp_change_origin_, DSP_CHANGE_SYNC_PREF); SetDefaultSearchProvider(new_default_search); pending_synced_default_search_ = false; @@ -980,12 +980,12 @@ syncer::SyncError TemplateURLService::ProcessSyncChanges( } DCHECK(loaded_); - AutoReset<bool> processing_changes(&processing_syncer_changes_, true); + base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true); // We've started syncing, so set our origin member to the base Sync value. // As we move through Sync Code, we may set this to increasingly specific // origins so we can tell what exactly caused a DSP change. - AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_, + base::AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_, DSP_CHANGE_SYNC_UNINTENTIONAL); syncer::SyncChangeList new_changes; @@ -1138,12 +1138,12 @@ syncer::SyncMergeResult TemplateURLService::MergeDataAndStartSyncing( // We do a lot of calls to Add/Remove/ResetTemplateURL here, so ensure we // don't step on our own toes. - AutoReset<bool> processing_changes(&processing_syncer_changes_, true); + base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true); // We've started syncing, so set our origin member to the base Sync value. // As we move through Sync Code, we may set this to increasingly specific // origins so we can tell what exactly caused a DSP change. - AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_, + base::AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_, DSP_CHANGE_SYNC_UNINTENTIONAL); syncer::SyncChangeList new_changes; @@ -1213,7 +1213,7 @@ syncer::SyncMergeResult TemplateURLService::MergeDataAndStartSyncing( // above, set it now. TemplateURL* pending_default = GetPendingSyncedDefaultSearchProvider(); if (pending_default) { - AutoReset<DefaultSearchChangeOrigin> change_origin( + base::AutoReset<DefaultSearchChangeOrigin> change_origin( &dsp_change_origin_, DSP_CHANGE_SYNC_ADD); SetDefaultSearchProvider(pending_default); } @@ -2113,7 +2113,7 @@ void TemplateURLService::UpdateDefaultSearch() { // Otherwise, it should be FindNewDefaultSearchProvider. TemplateURL* synced_default = GetPendingSyncedDefaultSearchProvider(); if (synced_default) { - AutoReset<DefaultSearchChangeOrigin> change_origin( + base::AutoReset<DefaultSearchChangeOrigin> change_origin( &dsp_change_origin_, DSP_CHANGE_SYNC_NOT_MANAGED); pending_synced_default_search_ = false; } @@ -2517,7 +2517,7 @@ void TemplateURLService::SetDefaultSearchProviderIfNewlySynced( // really just added this TemplateURL. TemplateURL* turl_from_sync = GetTemplateURLForGUID(guid); if (turl_from_sync && turl_from_sync->SupportsReplacement()) { - AutoReset<DefaultSearchChangeOrigin> change_origin( + base::AutoReset<DefaultSearchChangeOrigin> change_origin( &dsp_change_origin_, DSP_CHANGE_SYNC_ADD); SetDefaultSearchProvider(turl_from_sync); } diff --git a/chrome/browser/ui/app_list/apps_model_builder.cc b/chrome/browser/ui/app_list/apps_model_builder.cc index 3cc0781..6932c70 100644 --- a/chrome/browser/ui/app_list/apps_model_builder.cc +++ b/chrome/browser/ui/app_list/apps_model_builder.cc @@ -108,7 +108,7 @@ void AppsModelBuilder::ResortApps() { std::sort(apps.begin(), apps.end(), &AppPrecedes); - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); // Adjusts the order of apps as needed in |model_| based on |apps|. for (size_t i = 0; i < apps.size(); ++i) { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index 056d27a..6a73b9b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -597,7 +597,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver { } - (void)createNewFolders { - AutoReset<BOOL> creatingNewFoldersSetter(&creatingNewFolders_, YES); + base::AutoReset<BOOL> creatingNewFoldersSetter(&creatingNewFolders_, YES); // Scan the tree looking for nodes marked 'newFolder' and create those nodes. NSArray* folderTreeArray = [self folderTreeArray]; for (BookmarkFolderInfo *folderInfo in folderTreeArray) { diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index 4d7e600..7f46c99 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm @@ -376,7 +376,7 @@ void DrawBulletInFrame(NSRect frame) { // Prevent reentrancy due to the frameOfCellAtColumn:row: call below. if (isComputingRowHeight_) return 1; - AutoReset<BOOL> reset(&isComputingRowHeight_, YES); + base::AutoReset<BOOL> reset(&isComputingRowHeight_, YES); NSCell* cell = [[[outlineView_ tableColumns] objectAtIndex:0] dataCell]; [cell setStringValue:[item objectForKey:kTitleKey]]; diff --git a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm index ee0904c..c930c577 100644 --- a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm +++ b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm @@ -823,7 +823,7 @@ NSCursor* LoadWebKitCursor(WebKit::WebCursorInfo::Type type) { - (void)activate { // Activate the window. -|windowDidBecomeKey:| will be called when // window becomes active. - AutoReset<BOOL> pin(&activationRequestedByPanel_, true); + base::AutoReset<BOOL> pin(&activationRequestedByPanel_, true); [BrowserWindowUtils activateWindowForController:self]; } diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 0a49ec2..ba1f807 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -132,7 +132,7 @@ TEST_F(ContentSettingBubbleModelTest, Plugins) { TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) { CommandLine* cmd = CommandLine::ForCurrentProcess(); - AutoReset<CommandLine> auto_reset(cmd, *cmd); + base::AutoReset<CommandLine> auto_reset(cmd, *cmd); cmd->AppendSwitch(switches::kEnableResourceContentSettings); HostContentSettingsMap* map = profile()->GetHostContentSettingsMap(); diff --git a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc index b4a41a96..c62b53b 100644 --- a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.cc @@ -111,7 +111,7 @@ void MediaGalleriesDialogGtk::UpdateGallery( checkbox_map_[gallery] = widget; } - AutoReset<bool> reset(&ignore_toggles_, true); + base::AutoReset<bool> reset(&ignore_toggles_, true); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), permitted); } diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index c2f5567..4758a1b 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -371,7 +371,7 @@ void TaskManagerGtk::OnItemsChanged(int start, int length) { } void TaskManagerGtk::OnItemsAdded(int start, int length) { - AutoReset<bool> autoreset(&ignore_selection_changed_, true); + base::AutoReset<bool> autoreset(&ignore_selection_changed_, true); GtkTreeIter iter; if (start == 0) { @@ -397,7 +397,7 @@ void TaskManagerGtk::OnItemsAdded(int start, int length) { void TaskManagerGtk::OnItemsRemoved(int start, int length) { { - AutoReset<bool> autoreset(&ignore_selection_changed_, true); + base::AutoReset<bool> autoreset(&ignore_selection_changed_, true); GtkTreeIter iter; gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(process_list_), &iter, @@ -966,7 +966,7 @@ void TaskManagerGtk::OnTreeViewRealize(GtkTreeView* treeview) { void TaskManagerGtk::OnSelectionChanged(GtkTreeSelection* selection) { if (ignore_selection_changed_) return; - AutoReset<bool> autoreset(&ignore_selection_changed_, true); + base::AutoReset<bool> autoreset(&ignore_selection_changed_, true); // The set of groups that should be selected. std::set<TaskManagerModel::GroupRange> ranges; diff --git a/chrome/browser/ui/panels/docked_panel_strip.cc b/chrome/browser/ui/panels/docked_panel_strip.cc index 7c34aee..46109a8 100644 --- a/chrome/browser/ui/panels/docked_panel_strip.cc +++ b/chrome/browser/ui/panels/docked_panel_strip.cc @@ -472,7 +472,7 @@ void DockedPanelStrip::RestorePanel(Panel* panel) { void DockedPanelStrip::MinimizeAll() { // Set minimizing_all_ to prevent deactivation of each panel when it // is minimized. See comments in OnPanelExpansionStateChanged. - AutoReset<bool> pin(&minimizing_all_, true); + base::AutoReset<bool> pin(&minimizing_all_, true); Panel* minimized_active_panel = NULL; for (Panels::const_iterator iter = panels_.begin(); iter != panels_.end(); ++iter) { diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 6315cb8..3b8740c7 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -816,7 +816,7 @@ StatusBubble* BrowserView::GetStatusBubble() { namespace { // Only used by ToolbarSizeChanged() below, but placed here because template - // arguments (to AutoReset<>) must have external linkage. + // arguments (to base::AutoReset<>) must have external linkage. enum CallState { NORMAL, REENTRANT, REENTRANT_FORCE_FAST_RESIZE }; } @@ -1028,7 +1028,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating) { ConvertPointToTarget(infobar_container_, this, &infobar_top); top_arrow_height = infobar_top.y() - icon_bottom.y(); } - AutoReset<CallState> resetter(&call_state, + base::AutoReset<CallState> resetter(&call_state, is_animating ? REENTRANT_FORCE_FAST_RESIZE : REENTRANT); infobar_container_->SetMaxTopArrowHeight(top_arrow_height); } diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index e14127e..9e18298 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -1969,7 +1969,8 @@ LRESULT OmniboxViewWin::OnSetText(const wchar_t* text) { // We wouldn't need to do this update anyway, because either we're in the // middle of updating the omnibox already or the caller of SetWindowText() // is going to update the omnibox next. - AutoReset<bool> auto_reset_ignore_ime_messages(&ignore_ime_messages_, true); + base::AutoReset<bool> auto_reset_ignore_ime_messages( + &ignore_ime_messages_, true); return DefWindowProc(WM_SETTEXT, 0, reinterpret_cast<LPARAM>(text)); } @@ -2614,7 +2615,7 @@ void OmniboxViewWin::StartDragIfNecessary(const CPoint& point) { scoped_refptr<ui::DragSource> drag_source(new ui::DragSource); DWORD dropped_mode; - AutoReset<bool> auto_reset_in_drag(&in_drag_, true); + base::AutoReset<bool> auto_reset_in_drag(&in_drag_, true); if (DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data), drag_source, supported_modes, &dropped_mode) == DRAGDROP_S_DROP) { diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 7097865..6673eacf 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -1168,7 +1168,7 @@ void TabDragController::Attach(TabStrip* attached_tabstrip, tab_strip_point.Offset(-mouse_offset_.x(), -mouse_offset_.y()); gfx::Rect bounds = GetDraggedViewTabStripBounds(tab_strip_point); int index = GetInsertionIndexForDraggedBounds(bounds); - AutoReset<bool> setter(&is_mutating_, true); + base::AutoReset<bool> setter(&is_mutating_, true); for (size_t i = 0; i < drag_data_.size(); ++i) { int add_types = TabStripModel::ADD_NONE; if (attached_tabstrip_->touch_layout_.get()) { @@ -1703,7 +1703,7 @@ void TabDragController::RevertDragAt(size_t drag_index) { DCHECK(started_drag_); DCHECK(source_tabstrip_); - AutoReset<bool> setter(&is_mutating_, true); + base::AutoReset<bool> setter(&is_mutating_, true); TabDragData* data = &(drag_data_[drag_index]); if (attached_tabstrip_) { int index = @@ -1801,7 +1801,7 @@ void TabDragController::CompleteDrag() { // the top-right corner. window_bounds.set_x(window_bounds.x() - window_bounds.width()); } - AutoReset<bool> setter(&is_mutating_, true); + base::AutoReset<bool> setter(&is_mutating_, true); std::vector<TabStripModelDelegate::NewStripContents> contentses; for (size_t i = 0; i < drag_data_.size(); ++i) { diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 374e605..9bfd5d3 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc @@ -62,14 +62,14 @@ class MockDownloadsDOMHandler : public DownloadsDOMHandler { void WaitForDownloadsList() { if (downloads_list_.get()) return; - AutoReset<bool> reset_waiting(&waiting_list_, true); + base::AutoReset<bool> reset_waiting(&waiting_list_, true); content::RunMessageLoop(); } void WaitForDownloadUpdated() { if (download_updated_.get()) return; - AutoReset<bool> reset_waiting(&waiting_updated_, true); + base::AutoReset<bool> reset_waiting(&waiting_updated_, true); content::RunMessageLoop(); } diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index ef4056f..2c5adff 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -697,7 +697,8 @@ void ExtensionSettingsHandler::HandleEnableIncognitoMessage( // notification for this case. // // Bug: http://crbug.com/41384 - AutoReset<bool> auto_reset_ignore_notifications(&ignore_notifications_, true); + base::AutoReset<bool> auto_reset_ignore_notifications( + &ignore_notifications_, true); extension_service_->SetIsIncognitoEnabled(extension->id(), enable_str == "true"); } diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index a5d6823..b146a15 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -332,7 +332,7 @@ void AppLauncherHandler::Observe(int type, void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) { // CreateAppInfo and ClearOrdinals can change the extension prefs. - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); ListValue* list = new ListValue(); @@ -381,7 +381,7 @@ DictionaryValue* AppLauncherHandler::GetAppInfo(const Extension* extension) { extension_service_->app_notification_manager(); DictionaryValue* app_info = new DictionaryValue(); // CreateAppInfo can change the extension prefs. - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); CreateAppInfo(extension, notification_manager->GetLast(extension->id()), extension_service_, @@ -541,7 +541,7 @@ void AppLauncherHandler::HandleSetLaunchType(const ListValue* args) { return; // Don't update the page; it already knows about the launch type change. - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); extension_service_->extension_prefs()->SetLaunchType( extension_id, @@ -571,7 +571,7 @@ void AppLauncherHandler::HandleUninstallApp(const ListValue* args) { bool dont_confirm = false; if (args->GetBoolean(1, &dont_confirm) && dont_confirm) { - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); ExtensionUninstallAccepted(); } else { GetExtensionUninstallDialog()->ConfirmUninstall(extension); @@ -615,7 +615,7 @@ void AppLauncherHandler::HandleReorderApps(const ListValue* args) { } // Don't update the page; it already knows the apps have been reordered. - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); extension_service_->extension_prefs()->SetAppDraggedByUser(dragged_app_id); extension_service_->OnExtensionMoved(dragged_app_id, predecessor_to_moved_ext, @@ -635,7 +635,7 @@ void AppLauncherHandler::HandleSetPageIndex(const ListValue* args) { static_cast<size_t>(page_index)); // Don't update the page; it already knows the apps have been reordered. - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); extension_sorting->SetPageOrdinal(extension_id, page_ordinal); } @@ -646,7 +646,7 @@ void AppLauncherHandler::HandleSaveAppPageName(const ListValue* args) { double page_index; CHECK(args->GetDouble(1, &page_index)); - AutoReset<bool> auto_reset(&ignore_changes_, true); + base::AutoReset<bool> auto_reset(&ignore_changes_, true); PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs(); ListPrefUpdate update(prefs, prefs::kNtpAppPageNames); ListValue* list = update.Get(); diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index 183a8d2..e3d8724 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -655,7 +655,7 @@ void PrintWebViewHelper::OnPrintForPrintPreview( // Set |print_for_preview_| flag and autoreset it to back to original // on return. - AutoReset<bool> set_printing_flag(&print_for_preview_, true); + base::AutoReset<bool> set_printing_flag(&print_for_preview_, true); WebKit::WebFrame* pdf_frame = pdf_element.document().frame(); if (!UpdatePrintSettings(pdf_frame, pdf_element, job_settings)) { diff --git a/content/browser/dom_storage/dom_storage_message_filter.cc b/content/browser/dom_storage/dom_storage_message_filter.cc index d2c5b4f..3fa4bd7 100644 --- a/content/browser/dom_storage/dom_storage_message_filter.cc +++ b/content/browser/dom_storage/dom_storage_message_filter.cc @@ -121,7 +121,7 @@ void DOMStorageMessageFilter::OnSetItem( const string16& value, const GURL& page_url) { DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK_EQ(0, connection_dispatching_message_for_); - AutoReset<int> auto_reset(&connection_dispatching_message_for_, + base::AutoReset<int> auto_reset(&connection_dispatching_message_for_, connection_id); NullableString16 not_used; bool success = host_->SetAreaItem(connection_id, key, value, @@ -134,7 +134,7 @@ void DOMStorageMessageFilter::OnRemoveItem( const GURL& page_url) { DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK_EQ(0, connection_dispatching_message_for_); - AutoReset<int> auto_reset(&connection_dispatching_message_for_, + base::AutoReset<int> auto_reset(&connection_dispatching_message_for_, connection_id); string16 not_used; host_->RemoveAreaItem(connection_id, key, page_url, ¬_used); @@ -145,7 +145,7 @@ void DOMStorageMessageFilter::OnClear( int connection_id, const GURL& page_url) { DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK_EQ(0, connection_dispatching_message_for_); - AutoReset<int> auto_reset(&connection_dispatching_message_for_, + base::AutoReset<int> auto_reset(&connection_dispatching_message_for_, connection_id); host_->ClearArea(connection_id, page_url); Send(new DOMStorageMsg_AsyncOperationComplete(true)); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 7e4c4e0..777e1f5 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -666,7 +666,8 @@ BackingStore* RenderWidgetHostImpl::GetBackingStore(bool force_create) { // We should never be called recursively; this can theoretically lead to // infinite recursion and almost certainly leads to lower performance. DCHECK(!in_get_backing_store_) << "GetBackingStore called recursively!"; - AutoReset<bool> auto_reset_in_get_backing_store(&in_get_backing_store_, true); + base::AutoReset<bool> auto_reset_in_get_backing_store( + &in_get_backing_store_, true); // We might have a cached backing store that we can reuse! BackingStore* backing_store = NULL; diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 63d1fe9..fdfee27 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -372,8 +372,8 @@ void WebContentsViewAura::PrepareOverscrollWindow() { // callback, and that tries to reset |overscroll_window_| again, causing a // double-free. So use a temporary variable here. if (overscroll_window_.get()) { - AutoReset<OverscrollMode> reset_state(¤t_overscroll_gesture_, - current_overscroll_gesture_); + base::AutoReset<OverscrollMode> reset_state(¤t_overscroll_gesture_, + current_overscroll_gesture_); scoped_ptr<aura::Window> reset_window(overscroll_window_.release()); } diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc index 1664b2e..a85fdb5 100644 --- a/content/common/np_channel_base.cc +++ b/content/common/np_channel_base.cc @@ -227,7 +227,7 @@ void NPChannelBase::RemoveRoute(int route_id) { DCHECK(non_npobject_count_ >= 0); if (!non_npobject_count_) { - AutoReset<bool> auto_reset_in_remove_route(&in_remove_route_, true); + base::AutoReset<bool> auto_reset_in_remove_route(&in_remove_route_, true); for (ListenerMap::iterator npobj_iter = npobject_listeners_.begin(); npobj_iter != npobject_listeners_.end(); ++npobj_iter) { if (npobj_iter->second) { diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index e625006..a05cfec 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -299,8 +299,9 @@ bool WebPluginDelegateProxy::Initialize( #if defined(OS_MACOSX) // TODO(shess): Debugging for http://crbug.com/97285 . See comment // in plugin_channel_host.cc. - scoped_ptr<AutoReset<bool> > track_nested_removes(new AutoReset<bool>( - PluginChannelHost::GetRemoveTrackingFlag(), true)); + scoped_ptr<base::AutoReset<bool> > track_nested_removes( + new base::AutoReset<bool>(PluginChannelHost::GetRemoveTrackingFlag(), + true)); #endif IPC::ChannelHandle channel_handle; diff --git a/content/shell/shell.cc b/content/shell/shell.cc index 48f462d..ae0fc6e 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -85,7 +85,7 @@ Shell* Shell::CreateShell(WebContents* web_contents) { } void Shell::CloseAllWindows() { - AutoReset<bool> auto_reset(&quit_message_loop_, false); + base::AutoReset<bool> auto_reset(&quit_message_loop_, false); std::vector<Shell*> open_windows(windows_); for (size_t i = 0; i < open_windows.size(); ++i) open_windows[i]->Close(); diff --git a/content/shell/shell_application_mac.mm b/content/shell/shell_application_mac.mm index 0ccce07..7279188 100644 --- a/content/shell/shell_application_mac.mm +++ b/content/shell/shell_application_mac.mm @@ -17,7 +17,7 @@ } - (void)sendEvent:(NSEvent*)event { - AutoReset<BOOL> scoper(&handlingSendEvent_, YES); + base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES); [super sendEvent:event]; } diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 6fb4416..10af1fe 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -420,7 +420,8 @@ void Channel::ChannelImpl::OnIOCompleted(MessageLoopForIO::IOContext* context, // We don't support recursion through OnMessageReceived yet! DCHECK(!processing_incoming_); - AutoReset<bool> auto_reset_processing_incoming(&processing_incoming_, true); + base::AutoReset<bool> auto_reset_processing_incoming( + &processing_incoming_, true); // Process the new data. if (input_state_.is_pending) { diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc index 3f8dadf..76a72f0 100644 --- a/sync/engine/sync_scheduler_impl.cc +++ b/sync/engine/sync_scheduler_impl.cc @@ -747,7 +747,7 @@ bool SyncSchedulerImpl::DoSyncSessionJob(scoped_ptr<SyncSessionJob> job) { session_context_->routing_info(), session_context_->workers()); } - AutoReset<bool> protector(&no_scheduling_allowed_, true); + base::AutoReset<bool> protector(&no_scheduling_allowed_, true); JobProcessDecision decision = DecideOnJob(*job); SDVLOG(2) << "Should run " << SyncSessionJob::GetPurposeString(job->purpose()) @@ -816,7 +816,7 @@ bool SyncSchedulerImpl::FinishSyncSessionJob(scoped_ptr<SyncSessionJob> job, // Let job know that we're through syncing (calling SyncShare) at this point. bool succeeded = false; { - AutoReset<bool> protector(&no_scheduling_allowed_, true); + base::AutoReset<bool> protector(&no_scheduling_allowed_, true); succeeded = job->Finish(exited_prematurely); } diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index d734807..1531710 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -625,19 +625,19 @@ void RootWindow::HandleMouseMoved(const ui::MouseEvent& event, Window* target) { } bool RootWindow::ProcessMouseEvent(Window* target, ui::MouseEvent* event) { - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return ProcessEvent(target, event) != ui::ER_UNHANDLED; } bool RootWindow::ProcessKeyEvent(Window* target, ui::KeyEvent* event) { if (!target) target = this; - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return ProcessEvent(target, event) != ui::ER_UNHANDLED; } bool RootWindow::ProcessScrollEvent(Window* target, ui::ScrollEvent* event) { - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return ProcessEvent(target, event) != ui::ER_UNHANDLED; } @@ -645,7 +645,7 @@ ui::EventResult RootWindow::ProcessTouchEvent(Window* target, ui::TouchEvent* event) { if (!target) target = this; - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return static_cast<ui::EventResult>(ProcessEvent(target, event)); } @@ -653,7 +653,7 @@ ui::EventResult RootWindow::ProcessGestureEvent(Window* target, ui::GestureEvent* event) { if (!target) target = this; - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return static_cast<ui::EventResult>(ProcessEvent(target, event)); } @@ -971,7 +971,7 @@ bool RootWindow::DispatchMouseEventToTarget(ui::MouseEvent* event, ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON; - AutoReset<Window*> reset(&mouse_event_dispatch_target_, target); + base::AutoReset<Window*> reset(&mouse_event_dispatch_target_, target); SetLastMouseLocation(this, event->location()); synthesize_mouse_move_ = false; switch (event->type()) { diff --git a/ui/base/win/mouse_wheel_util.cc b/ui/base/win/mouse_wheel_util.cc index 6b93e66..2cf18de 100644 --- a/ui/base/win/mouse_wheel_util.cc +++ b/ui/base/win/mouse_wheel_util.cc @@ -104,7 +104,7 @@ bool RerouteMouseWheel(HWND window, WPARAM w_param, LPARAM l_param) { // window_under_wheel is a Chrome window. If allowed, redirect. if (IsCompatibleWithMouseWheelRedirection(window_under_wheel)) { - AutoReset<bool> auto_reset_recursion_break(&recursion_break, true); + base::AutoReset<bool> auto_reset_recursion_break(&recursion_break, true); SendMessage(window_under_wheel, WM_MOUSEWHEEL, w_param, l_param); return true; } diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 5089312..d9cd298 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -254,7 +254,7 @@ void FocusManager::SetFocusedViewWithReason( if (focused_view_ == view) return; - AutoReset<bool> auto_changing_focus(&is_changing_focus_, true); + base::AutoReset<bool> auto_changing_focus(&is_changing_focus_, true); // Update the reason for the focus change (since this is checked by // some listeners), then notify all listeners. focus_change_reason_ = reason; diff --git a/ui/views/widget/desktop_aura/desktop_activation_client.cc b/ui/views/widget/desktop_aura/desktop_activation_client.cc index 94fb582..27330dd 100644 --- a/ui/views/widget/desktop_aura/desktop_activation_client.cc +++ b/ui/views/widget/desktop_aura/desktop_activation_client.cc @@ -42,7 +42,7 @@ void DesktopActivationClient::ActivateWindow(aura::Window* window) { if (updating_activation_) return; - AutoReset<bool> in_activate_window(&updating_activation_, true); + base::AutoReset<bool> in_activate_window(&updating_activation_, true); // Nothing may actually have changed. if (current_active_ == window) return; diff --git a/webkit/appcache/appcache_database.cc b/webkit/appcache/appcache_database.cc index 90c2d7c..77a8f15 100644 --- a/webkit/appcache/appcache_database.cc +++ b/webkit/appcache/appcache_database.cc @@ -1127,7 +1127,7 @@ bool AppCacheDatabase::DeleteExistingAndCreateNewDatabase() { if (is_recreating_) return false; - AutoReset<bool> auto_reset(&is_recreating_, true); + base::AutoReset<bool> auto_reset(&is_recreating_, true); return LazyOpen(true); } diff --git a/webkit/database/database_connections.cc b/webkit/database/database_connections.cc index e16080c..f6bbfd2 100644 --- a/webkit/database/database_connections.cc +++ b/webkit/database/database_connections.cc @@ -131,7 +131,7 @@ void DatabaseConnectionsWrapper::WaitForAllDatabasesToClose() { // We assume that new databases won't be open while we're waiting. DCHECK(main_thread_->BelongsToCurrentThread()); if (HasOpenConnections()) { - AutoReset<bool> auto_reset(&waiting_for_dbs_to_close_, true); + base::AutoReset<bool> auto_reset(&waiting_for_dbs_to_close_, true); MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current()); MessageLoop::current()->Run(); } diff --git a/webkit/quota/quota_database.cc b/webkit/quota/quota_database.cc index 915d5bf..c604c56 100644 --- a/webkit/quota/quota_database.cc +++ b/webkit/quota/quota_database.cc @@ -579,7 +579,7 @@ bool QuotaDatabase::ResetSchema() { if (is_recreating_) return false; - AutoReset<bool> auto_reset(&is_recreating_, true); + base::AutoReset<bool> auto_reset(&is_recreating_, true); return LazyOpen(true); } diff --git a/webkit/support/drt_application_mac.mm b/webkit/support/drt_application_mac.mm index 9b6a5ea..0c2f900 100644 --- a/webkit/support/drt_application_mac.mm +++ b/webkit/support/drt_application_mac.mm @@ -13,7 +13,7 @@ } - (void)sendEvent:(NSEvent*)event { - AutoReset<BOOL> scoper(&handlingSendEvent_, YES); + base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES); [super sendEvent:event]; } diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc index 4e040e2..0078b4d 100644 --- a/webkit/tools/test_shell/simple_dom_storage_system.cc +++ b/webkit/tools/test_shell/simple_dom_storage_system.cc @@ -161,7 +161,7 @@ void SimpleDomStorageSystem::AreaImpl::setItem( if (!Host()) return; - AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); + base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); NullableString16 unused; if (!Host()->SetAreaItem(connection_id_, key, newValue, pageUrl, &unused)) @@ -175,7 +175,7 @@ void SimpleDomStorageSystem::AreaImpl::removeItem( if (!Host()) return; - AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); + base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); string16 notused; Host()->RemoveAreaItem(connection_id_, key, pageUrl, ¬used); } @@ -184,7 +184,7 @@ void SimpleDomStorageSystem::AreaImpl::clear(const WebURL& pageUrl) { if (!Host()) return; - AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); + base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); Host()->ClearArea(connection_id_, pageUrl); } |