diff options
| author | tapted <tapted@chromium.org> | 2016-02-18 20:21:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-19 04:22:25 +0000 |
| commit | c7b91ca0be4cc9728b5769cbbe217ec8a8512f01 (patch) | |
| tree | 23a5fb19ab50415006ca3075842d4d08ff55b596 /chrome/chrome_browser_ui.gypi | |
| parent | a24c569a55edae9847467f6086d23a12af564a4f (diff) | |
| download | chromium_src-c7b91ca0be4cc9728b5769cbbe217ec8a8512f01.zip chromium_src-c7b91ca0be4cc9728b5769cbbe217ec8a8512f01.tar.gz chromium_src-c7b91ca0be4cc9728b5769cbbe217ec8a8512f01.tar.bz2 | |
Views/Refactor: Move the profile switcher into browser frame subtypes that use it
And isolate the FRAME_AVATAR_BUTTON #define to just the Mus browser
frame.
Currently lots of code around views browser frames is conditionally
compiled based on FRAME_AVATAR_BUTTON, and it isn't nice. It was added
in r344002 to allow some unnecessary build files to be excluded on
ChromeOS and was always meant to be temporary.
Previously FRAME_AVATAR_BUTTON was synonymous with "not ChromeOS". The
other browser frames do not need it because the Ash frame only compiles
on ChromeOS, and the Glass/Opaque frames never compile on ChromeOS. Mus
is the only frame that can compile both on ChromeOS and other platforms.
So remove it by moving the AvatarButtonManager out of the shared
BrowserNonClientFrameView base class, and into the subclasses that need
it.
The code to layout the profile switcher on a Mus frame was removed in
r373010 because it didn't compile. This CL adds back some simple layout
logic to test.
BUG=565989
Review URL: https://codereview.chromium.org/1700023002
Cr-Commit-Position: refs/heads/master@{#376377}
Diffstat (limited to 'chrome/chrome_browser_ui.gypi')
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 3b4b214..17f2785 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -1314,6 +1314,7 @@ 'browser/ui/sync/one_click_signin_sync_starter.h', 'browser/ui/views/frame/avatar_button_manager.cc', 'browser/ui/views/frame/avatar_button_manager.h', + 'browser/ui/views/profiles/avatar_button_delegate.h', 'browser/ui/views/profiles/avatar_button_style.h', 'browser/ui/views/profiles/new_avatar_button.cc', 'browser/ui/views/profiles/new_avatar_button.h', @@ -3075,9 +3076,6 @@ ], }], ['OS=="win" or OS=="mac" or desktop_linux==1', { - # A temporary define to make it easier to remove CrOS dependencies on - # avatar button code. TODO(estade): remove. - 'defines': [ 'FRAME_AVATAR_BUTTON=1', ], 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], }], ['use_aura==1', { |