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

Side by Side Diff: chrome/browser/ui/webui/options/manage_profile_handler.h

Issue 225523004: Updates the UI and reenables the fix introduced in commit 256939 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes chromeos_rel test failure and includes a rebase Created 6 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGE_PROFILE_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGE_PROFILE_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGE_PROFILE_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGE_PROFILE_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 28 matching lines...) Expand all
39 39
40 // content::NotificationObserver: 40 // content::NotificationObserver:
41 virtual void Observe(int type, 41 virtual void Observe(int type,
42 const content::NotificationSource& source, 42 const content::NotificationSource& source,
43 const content::NotificationDetails& details) OVERRIDE; 43 const content::NotificationDetails& details) OVERRIDE;
44 44
45 // ProfileSyncServiceObserver: 45 // ProfileSyncServiceObserver:
46 virtual void OnStateChanged() OVERRIDE; 46 virtual void OnStateChanged() OVERRIDE;
47 47
48 private: 48 private:
49 // This function creates signed in user specific strings in loadTimeData.
50 void GenerateSignedinUserSpecificStrings(base::DictionaryValue* dictionary);
51
49 // Callback for the "requestDefaultProfileIcons" message. 52 // Callback for the "requestDefaultProfileIcons" message.
50 // Sends the array of default profile icon URLs and profile names to WebUI. 53 // Sends the array of default profile icon URLs and profile names to WebUI.
51 // First item of |args| is the dialog mode, i.e. "create" or "manage". 54 // First item of |args| is the dialog mode, i.e. "create" or "manage".
52 void RequestDefaultProfileIcons(const base::ListValue* args); 55 void RequestDefaultProfileIcons(const base::ListValue* args);
53 56
54 // Callback for the "requestNewProfileDefaults" message. 57 // Callback for the "requestNewProfileDefaults" message.
55 // Sends an object to WebUI of the form: 58 // Sends an object to WebUI of the form:
56 // { "name": profileName, "iconURL": iconURL } 59 // { "name": profileName, "iconURL": iconURL }
57 void RequestNewProfileDefaults(const base::ListValue* args); 60 void RequestNewProfileDefaults(const base::ListValue* args);
58 61
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 131
129 // For generating weak pointers to itself for callbacks. 132 // For generating weak pointers to itself for callbacks.
130 base::WeakPtrFactory<ManageProfileHandler> weak_factory_; 133 base::WeakPtrFactory<ManageProfileHandler> weak_factory_;
131 134
132 DISALLOW_COPY_AND_ASSIGN(ManageProfileHandler); 135 DISALLOW_COPY_AND_ASSIGN(ManageProfileHandler);
133 }; 136 };
134 137
135 } // namespace options 138 } // namespace options
136 139
137 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGE_PROFILE_HANDLER_H_ 140 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGE_PROFILE_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/manage_profile_overlay.js ('k') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698