Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/ui/webui/settings/about_handler.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/settings/about_handler.h" 5 #include "chrome/browser/ui/webui/settings/about_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "ash/common/system/chromeos/devicetype_utils.h" 11 #include "ash/system/devicetype_utils.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/files/file_util.h" 16 #include "base/files/file_util.h"
17 #include "base/i18n/message_formatter.h" 17 #include "base/i18n/message_formatter.h"
18 #include "base/location.h" 18 #include "base/location.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/strings/string16.h" 20 #include "base/strings/string16.h"
21 #include "base/strings/string_util.h" 21 #include "base/strings/string_util.h"
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 label_dir_path.AppendASCII(kRegulatoryLabelImageFilename).MaybeAsASCII(); 648 label_dir_path.AppendASCII(kRegulatoryLabelImageFilename).MaybeAsASCII();
649 std::string url = 649 std::string url =
650 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; 650 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path;
651 regulatory_info->SetString("url", url); 651 regulatory_info->SetString("url", url);
652 652
653 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); 653 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info);
654 } 654 }
655 #endif // defined(OS_CHROMEOS) 655 #endif // defined(OS_CHROMEOS)
656 656
657 } // namespace settings 657 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698