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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

Issue 514493002: Cleanup: Remove unneeded grit include in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a
Patch Set: rebase Created 6 years, 3 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/options/chromeos/change_picture_options_handle r.h" 5 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.h"
6 6
7 #include "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 17 matching lines...) Expand all
28 #include "chromeos/audio/chromeos_sounds.h" 28 #include "chromeos/audio/chromeos_sounds.h"
29 #include "components/user_manager/user.h" 29 #include "components/user_manager/user.h"
30 #include "components/user_manager/user_image/default_user_images.h" 30 #include "components/user_manager/user_image/default_user_images.h"
31 #include "components/user_manager/user_image/user_image.h" 31 #include "components/user_manager/user_image/user_image.h"
32 #include "components/user_manager/user_manager.h" 32 #include "components/user_manager/user_manager.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
35 #include "content/public/browser/web_ui.h" 35 #include "content/public/browser/web_ui.h"
36 #include "content/public/common/url_constants.h" 36 #include "content/public/common/url_constants.h"
37 #include "grit/browser_resources.h" 37 #include "grit/browser_resources.h"
38 #include "grit/theme_resources.h"
39 #include "net/base/data_url.h" 38 #include "net/base/data_url.h"
40 #include "ui/base/l10n/l10n_util.h" 39 #include "ui/base/l10n/l10n_util.h"
41 #include "ui/base/resource/resource_bundle.h" 40 #include "ui/base/resource/resource_bundle.h"
42 #include "ui/base/webui/web_ui_util.h" 41 #include "ui/base/webui/web_ui_util.h"
43 #include "ui/views/widget/widget.h" 42 #include "ui/views/widget/widget.h"
44 #include "url/gurl.h" 43 #include "url/gurl.h"
45 44
46 using content::BrowserThread; 45 using content::BrowserThread;
47 46
48 namespace chromeos { 47 namespace chromeos {
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 user_manager::User* ChangePictureOptionsHandler::GetUser() const { 474 user_manager::User* ChangePictureOptionsHandler::GetUser() const {
476 Profile* profile = Profile::FromWebUI(web_ui()); 475 Profile* profile = Profile::FromWebUI(web_ui());
477 user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile); 476 user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
478 if (!user) 477 if (!user)
479 return user_manager::UserManager::Get()->GetActiveUser(); 478 return user_manager::UserManager::Get()->GetActiveUser();
480 return user; 479 return user;
481 } 480 }
482 481
483 } // namespace options 482 } // namespace options
484 } // namespace chromeos 483 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698