| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webui/chromeos/first_run/first_run_ui.h" | 5 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf.h" | 7 #include "ash/common/shelf/shelf.h" |
| 8 #include "ash/common/shelf/wm_shelf.h" |
| 8 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 9 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h" | 12 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h" |
| 12 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
| 13 #include "chrome/grit/chromium_strings.h" | 14 #include "chrome/grit/chromium_strings.h" |
| 14 #include "chrome/grit/generated_resources.h" | 15 #include "chrome/grit/generated_resources.h" |
| 15 #include "chromeos/chromeos_switches.h" | 16 #include "chromeos/chromeos_switches.h" |
| 16 #include "content/public/browser/web_ui.h" | 17 #include "content/public/browser/web_ui.h" |
| 17 #include "content/public/browser/web_ui_data_source.h" | 18 #include "content/public/browser/web_ui_data_source.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 localized_strings->SetString( | 56 localized_strings->SetString( |
| 56 "helpFinishButton", | 57 "helpFinishButton", |
| 57 l10n_util::GetStringUTF16(IDS_FIRST_RUN_HELP_STEP_FINISH_BUTTON)); | 58 l10n_util::GetStringUTF16(IDS_FIRST_RUN_HELP_STEP_FINISH_BUTTON)); |
| 58 localized_strings->SetString( | 59 localized_strings->SetString( |
| 59 "nextButton", l10n_util::GetStringUTF16(IDS_FIRST_RUN_NEXT_BUTTON)); | 60 "nextButton", l10n_util::GetStringUTF16(IDS_FIRST_RUN_NEXT_BUTTON)); |
| 60 localized_strings->SetBoolean( | 61 localized_strings->SetBoolean( |
| 61 "transitionsEnabled", | 62 "transitionsEnabled", |
| 62 base::CommandLine::ForCurrentProcess()->HasSwitch( | 63 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 63 chromeos::switches::kEnableFirstRunUITransitions)); | 64 chromeos::switches::kEnableFirstRunUITransitions)); |
| 64 std::string shelf_alignment; | 65 std::string shelf_alignment; |
| 65 switch (ash::Shelf::ForPrimaryDisplay()->alignment()) { | 66 switch (ash::Shelf::ForPrimaryDisplay()->wm_shelf()->alignment()) { |
| 66 case ash::SHELF_ALIGNMENT_BOTTOM: | 67 case ash::SHELF_ALIGNMENT_BOTTOM: |
| 67 case ash::SHELF_ALIGNMENT_BOTTOM_LOCKED: | 68 case ash::SHELF_ALIGNMENT_BOTTOM_LOCKED: |
| 68 shelf_alignment = kShelfAlignmentBottom; | 69 shelf_alignment = kShelfAlignmentBottom; |
| 69 break; | 70 break; |
| 70 case ash::SHELF_ALIGNMENT_LEFT: | 71 case ash::SHELF_ALIGNMENT_LEFT: |
| 71 shelf_alignment = kShelfAlignmentLeft; | 72 shelf_alignment = kShelfAlignmentLeft; |
| 72 break; | 73 break; |
| 73 case ash::SHELF_ALIGNMENT_RIGHT: | 74 case ash::SHELF_ALIGNMENT_RIGHT: |
| 74 shelf_alignment = kShelfAlignmentRight; | 75 shelf_alignment = kShelfAlignmentRight; |
| 75 break; | 76 break; |
| (...skipping 23 matching lines...) Expand all Loading... |
| 99 : WebUIController(web_ui), | 100 : WebUIController(web_ui), |
| 100 actor_(NULL) { | 101 actor_(NULL) { |
| 101 FirstRunHandler* handler = new FirstRunHandler(); | 102 FirstRunHandler* handler = new FirstRunHandler(); |
| 102 actor_ = handler; | 103 actor_ = handler; |
| 103 web_ui->AddMessageHandler(handler); | 104 web_ui->AddMessageHandler(handler); |
| 104 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), CreateDataSource()); | 105 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), CreateDataSource()); |
| 105 } | 106 } |
| 106 | 107 |
| 107 } // namespace chromeos | 108 } // namespace chromeos |
| 108 | 109 |
| OLD | NEW |