diff options
29 files changed, 36 insertions, 36 deletions
diff --git a/chrome/app/chrome_exe_main_gtk.cc b/chrome/app/chrome_exe_main_gtk.cc index fb3c332..b43c3de 100644 --- a/chrome/app/chrome_exe_main_gtk.cc +++ b/chrome/app/chrome_exe_main_gtk.cc @@ -5,7 +5,7 @@ #include "base/at_exit.h" #include "base/process_util.h" #if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #endif // The entry point for all invocations of Chromium, browser and renderer. On diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 857c86f..13f6b54 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -50,7 +50,7 @@ #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/find_bar.h" #include "chrome/browser/find_bar_controller.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/google_util.h" #include "chrome/browser/host_zoom_map.h" diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index c645420..8dc4cec 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -24,7 +24,7 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_creator.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/notifications/desktop_notification_service.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 82bc172..277cac1 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -37,7 +37,7 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics/histogram_synchronizer.h" #include "chrome/browser/metrics/metrics_log.h" diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 08ec951..1b327ac 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -19,7 +19,7 @@ #include "base/path_service.h" #include "base/win_util.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/views/uninstall_view.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 0e6a96fa..cb3ddc9 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -25,7 +25,7 @@ #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/download/download_file_manager.h" #include "chrome/browser/download/save_file_manager.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/in_process_webkit/dom_storage_context.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index a96b740..9646ad8 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -21,7 +21,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/plugin_process_host.h" diff --git a/chrome/browser/cocoa/keystone_infobar.mm b/chrome/browser/cocoa/keystone_infobar.mm index 2cf13e5..377818a 100644 --- a/chrome/browser/cocoa/keystone_infobar.mm +++ b/chrome/browser/cocoa/keystone_infobar.mm @@ -16,7 +16,7 @@ #import "chrome/browser/cocoa/keystone_glue.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/infobar_delegate.h" diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h index 03cf8f6..6fca22e 100644 --- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h @@ -18,7 +18,7 @@ #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/toolbar_model.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run/first_run.cc index bfcec8d..225067f 100644 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "build/build_config.h" diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run/first_run.h index 652d5c6..e83282f 100644 --- a/chrome/browser/first_run.h +++ b/chrome/browser/first_run/first_run.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FIRST_RUN_H_ -#define CHROME_BROWSER_FIRST_RUN_H_ +#ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ +#define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ #pragma once #include <string> @@ -295,4 +295,4 @@ bool OpenFirstRunDialog(Profile* profile, bool randomize_search_engine_experiment, ProcessSingleton* process_singleton); -#endif // CHROME_BROWSER_FIRST_RUN_H_ +#endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ diff --git a/chrome/browser/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc index 24572fc..d726e2ca 100644 --- a/chrome/browser/first_run_browsertest.cc +++ b/chrome/browser/first_run/first_run_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/browser_process.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/in_process_browser_test.h" diff --git a/chrome/browser/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc index f675732..d758585 100644 --- a/chrome/browser/first_run_gtk.cc +++ b/chrome/browser/first_run/first_run_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "app/app_switches.h" #include "base/file_path.h" diff --git a/chrome/browser/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm index a9c5d21..725784c 100644 --- a/chrome/browser/first_run_mac.mm +++ b/chrome/browser/first_run/first_run_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/first_run_unittest.cc b/chrome/browser/first_run/first_run_unittest.cc index 8555370..6a32fe1 100644 --- a/chrome/browser/first_run_unittest.cc +++ b/chrome/browser/first_run/first_run_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_util.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "testing/gtest/include/gtest/gtest.h" class FirstRunTest : public testing::Test { diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 38b5b66..2c22c42 100644 --- a/chrome/browser/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include <windows.h> #include <shellapi.h> diff --git a/chrome/browser/gtk/first_run_bubble.h b/chrome/browser/gtk/first_run_bubble.h index 3ef4d22..e319518 100644 --- a/chrome/browser/gtk/first_run_bubble.h +++ b/chrome/browser/gtk/first_run_bubble.h @@ -15,7 +15,7 @@ #include <vector> #include "base/basictypes.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/gtk/info_bubble_gtk.h" #include "chrome/browser/profile.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/browser/gtk/first_run_dialog.h b/chrome/browser/gtk/first_run_dialog.h index f757a42..fcc7e4a 100644 --- a/chrome/browser/gtk/first_run_dialog.h +++ b/chrome/browser/gtk/first_run_dialog.h @@ -10,7 +10,7 @@ typedef struct _GtkButton GtkButton; typedef struct _GtkWidget GtkWidget; #include "app/gtk_signal.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/importer.h" class FirstRunDialog : public ImportObserver { diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h index 89d813b..87b7c31 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.h +++ b/chrome/browser/gtk/location_bar_view_gtk.h @@ -19,7 +19,7 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/gtk/info_bubble_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/location_bar.h" diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index c84cc41..cdd2628 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -9,7 +9,7 @@ #include "base/stl_util-inl.h" #include "base/values.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/browser/importer/firefox3_importer.h" #include "chrome/browser/importer/firefox_importer_utils.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 5b0a93c..4c2cf56 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -9,7 +9,7 @@ #include "base/rand_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/importer_bridge.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/importer/toolbar_importer_unittest.cc b/chrome/browser/importer/toolbar_importer_unittest.cc index ea5c5e9..1e49c1c 100644 --- a/chrome/browser/importer/toolbar_importer_unittest.cc +++ b/chrome/browser/importer/toolbar_importer_unittest.cc @@ -9,7 +9,7 @@ #include "base/string16.h" #include "base/string_util.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/toolbar_importer.h" #include "chrome/common/libxml_utils.h" diff --git a/chrome/browser/location_bar.h b/chrome/browser/location_bar.h index 9feee38..8ead356 100644 --- a/chrome/browser/location_bar.h +++ b/chrome/browser/location_bar.h @@ -14,7 +14,7 @@ #include <string> -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 0ebc0c7..37c2efd 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -13,7 +13,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/options_window.h" #include "chrome/browser/search_engines/util.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/first_run_bubble.h b/chrome/browser/views/first_run_bubble.h index 83a1393..7de3969 100644 --- a/chrome/browser/views/first_run_bubble.h +++ b/chrome/browser/views/first_run_bubble.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/task.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/views/info_bubble.h" class FirstRunBubbleViewBase; diff --git a/chrome/browser/views/location_bar/location_bar_view.h b/chrome/browser/views/location_bar/location_bar_view.h index bfc74ff..2f1f8a7 100644 --- a/chrome/browser/views/location_bar/location_bar_view.h +++ b/chrome/browser/views/location_bar/location_bar_view.h @@ -12,7 +12,7 @@ #include "base/task.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/extensions/extension_context_menu_model.h" -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index bf7b9e8..f8976fe 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1390,11 +1390,11 @@ 'browser/find_bar_state.h', 'browser/find_bar_state.cc', 'browser/find_notification_details.h', - 'browser/first_run.cc', - 'browser/first_run.h', - 'browser/first_run_mac.mm', - 'browser/first_run_win.cc', - 'browser/first_run_gtk.cc', + 'browser/first_run/first_run.cc', + 'browser/first_run/first_run.h', + 'browser/first_run/first_run_mac.mm', + 'browser/first_run/first_run_win.cc', + 'browser/first_run/first_run_gtk.cc', 'browser/fonts_languages_window.h', 'browser/gears_integration.cc', 'browser/gears_integration.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b61efcf..7ee4b16 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -932,7 +932,7 @@ 'browser/extensions/user_script_master_unittest.cc', 'browser/file_watcher_unittest.cc', 'browser/find_backend_unittest.cc', - 'browser/first_run_unittest.cc', + 'browser/first_run/first_run_unittest.cc', 'browser/geolocation/fake_access_token_store.h', 'browser/geolocation/geolocation_content_settings_map_unittest.cc', 'browser/geolocation/geolocation_exceptions_table_model_unittest.cc', @@ -1587,7 +1587,7 @@ 'browser/extensions/permissions_apitest.cc', 'browser/extensions/stubs_apitest.cc', 'browser/find_bar_host_browsertest.cc', - 'browser/first_run_browsertest.cc', + 'browser/first_run/first_run_browsertest.cc', 'browser/geolocation/access_token_store_browsertest.cc', 'browser/geolocation/geolocation_browsertest.cc', 'browser/gtk/view_id_util_browsertest.cc', diff --git a/chrome/test/test_location_bar.h b/chrome/test/test_location_bar.h index 571823ad7..e968672 100644 --- a/chrome/test/test_location_bar.h +++ b/chrome/test/test_location_bar.h @@ -6,7 +6,7 @@ #define CHROME_TEST_TEST_LOCATION_BAR_H_ #pragma once -#include "chrome/browser/first_run.h" +#include "chrome/browser/first_run/first_run.h" #include "chrome/browser/location_bar.h" #include "chrome/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" |