chrome/browser/ui/views/frame/browser_non_client_frame_view.cc - Issue 229293002: [Win] Move profile related UI from ui/views/ to ui/views/profiles

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

Issue 229293002: [Win] Move profile related UI from ui/views/ to ui/views/profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view.h ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"	5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"

6	6

7 #include "chrome/browser/browser_process.h"	7 #include "chrome/browser/browser_process.h"

8 #include "chrome/browser/profiles/avatar_menu.h"	8 #include "chrome/browser/profiles/avatar_menu.h"

9 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

10 #include "chrome/browser/profiles/profile_info_cache.h"	10 #include "chrome/browser/profiles/profile_info_cache.h"

11 #include "chrome/browser/profiles/profile_manager.h"	11 #include "chrome/browser/profiles/profile_manager.h"

12 #include "chrome/browser/profiles/profiles_state.h"	12 #include "chrome/browser/profiles/profiles_state.h"

13 #include "chrome/browser/ui/view_ids.h"	13 #include "chrome/browser/ui/view_ids.h"

14 #include "chrome/browser/ui/views/avatar_label.h"

15 #include "chrome/browser/ui/views/avatar_menu_button.h"

16 #include "chrome/browser/ui/views/frame/browser_view.h"	14 #include "chrome/browser/ui/views/frame/browser_view.h"

17 #include "chrome/browser/ui/views/frame/taskbar_decorator.h"	15 #include "chrome/browser/ui/views/frame/taskbar_decorator.h"

18 #include "chrome/browser/ui/views/new_avatar_button.h"	16 #include "chrome/browser/ui/views/profiles/avatar_label.h"

	17 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"

	18 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"

19 #include "chrome/common/profile_management_switches.h"	19 #include "chrome/common/profile_management_switches.h"

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

21 #include "grit/theme_resources.h"	21 #include "grit/theme_resources.h"

22 #include "third_party/skia/include/core/SkColor.h"	22 #include "third_party/skia/include/core/SkColor.h"

23 #include "ui/base/l10n/l10n_util.h"	23 #include "ui/base/l10n/l10n_util.h"

24 #include "ui/base/resource/resource_bundle.h"	24 #include "ui/base/resource/resource_bundle.h"

25 #include "ui/base/theme_provider.h"	25 #include "ui/base/theme_provider.h"

26 #include "ui/gfx/image/image.h"	26 #include "ui/gfx/image/image.h"

27 #include "ui/views/background.h"	27 #include "ui/views/background.h"

28	28

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
156 new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);	156 new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);

157 AddChildView(new_avatar_button_);	157 AddChildView(new_avatar_button_);

158 frame_->GetRootView()->Layout();	158 frame_->GetRootView()->Layout();

159 }	159 }

160 } else if (new_avatar_button_) {	160 } else if (new_avatar_button_) {

161 delete new_avatar_button_;	161 delete new_avatar_button_;

162 new_avatar_button_ = NULL;	162 new_avatar_button_ = NULL;

163 frame_->GetRootView()->Layout();	163 frame_->GetRootView()->Layout();

164 }	164 }

165 }	165 }

OLD	NEW