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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.h

Issue 1972033002: Simplify some old avatar menu button code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reinstate ash browser test fix Created 4 years, 7 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_VIEWS_FRAME_BROWSER_FRAME_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 const ui::NativeTheme* GetNativeTheme() const override; 105 const ui::NativeTheme* GetNativeTheme() const override;
106 void SchedulePaintInRect(const gfx::Rect& rect) override; 106 void SchedulePaintInRect(const gfx::Rect& rect) override;
107 void OnNativeWidgetActivationChanged(bool active) override; 107 void OnNativeWidgetActivationChanged(bool active) override;
108 void OnNativeWidgetWorkspaceChanged() override; 108 void OnNativeWidgetWorkspaceChanged() override;
109 109
110 // Overridden from views::ContextMenuController: 110 // Overridden from views::ContextMenuController:
111 void ShowContextMenuForView(views::View* source, 111 void ShowContextMenuForView(views::View* source,
112 const gfx::Point& p, 112 const gfx::Point& p,
113 ui::MenuSourceType source_type) override; 113 ui::MenuSourceType source_type) override;
114 114
115 AvatarMenuButton* GetAvatarMenuButton();
116 views::View* GetNewAvatarMenuButton(); 115 views::View* GetNewAvatarMenuButton();
117 116
118 // Returns the menu model. BrowserFrame owns the returned model. 117 // Returns the menu model. BrowserFrame owns the returned model.
119 // Note that in multi user mode this will upon each call create a new model. 118 // Note that in multi user mode this will upon each call create a new model.
120 ui::MenuModel* GetSystemMenuModel(); 119 ui::MenuModel* GetSystemMenuModel();
121 120
122 private: 121 private:
123 NativeBrowserFrame* native_browser_frame_; 122 NativeBrowserFrame* native_browser_frame_;
124 123
125 // A weak reference to the root view associated with the window. We save a 124 // A weak reference to the root view associated with the window. We save a
(...skipping 14 matching lines...) Expand all
140 std::unique_ptr<views::MenuRunner> menu_runner_; 139 std::unique_ptr<views::MenuRunner> menu_runner_;
141 140
142 const ThemeService* theme_service_; 141 const ThemeService* theme_service_;
143 142
144 std::unique_ptr<ui::EventHandler> browser_command_handler_; 143 std::unique_ptr<ui::EventHandler> browser_command_handler_;
145 144
146 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); 145 DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
147 }; 146 };
148 147
149 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 148 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/avatar_button_manager.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698