Simplify RootWindowController init process
Fixed the order of method body to match the order in header.
BUG=253991
Review URL: https://chromiumcodereview.appspot.com/18266004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209915 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 28954663..393dcb31 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -163,16 +163,9 @@
aura::Window* GetContainer(int container_id);
- void InitLayoutManagers();
- void CreateContainers();
-
- // Initializs the RootWindowController for primary display. This
- // creates
- void InitForPrimaryDisplay();
-
- // Initializes |system_background_| and possibly also |boot_splash_screen_|.
- // |is_first_run_after_boot| determines the background's initial color.
- void CreateSystemBackground(bool is_first_run_after_boot);
+ // Initializes the RootWindowController. |first_run_after_boot| is
+ // set to true only for primary root window after boot.
+ void Init(bool first_run_after_boot);
// Show launcher view if it was created hidden (before session has started).
void ShowLauncher();
@@ -222,6 +215,12 @@
aura::Window* GetFullscreenWindow() const;
private:
+ void InitLayoutManagers();
+
+ // Initializes |system_background_| and possibly also |boot_splash_screen_|.
+ // |is_first_run_after_boot| determines the background's initial color.
+ void CreateSystemBackground(bool is_first_run_after_boot);
+
// Creates each of the special window containers that holds windows of various
// types in the shell UI.
void CreateContainersInRootWindow(aura::RootWindow* root_window);
