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

Side by Side Diff: chrome/browser/ui/panels/panel_browser_frame_view.h

Issue 7838018: Fix crash or hang on Windows when clicking on wrench icon in panel opened from non-extension domain. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 gfx::Font* GetTitleFont() const; 164 gfx::Font* GetTitleFont() const;
165 SkBitmap* GetFrameTheme(PaintState paint_state) const; 165 SkBitmap* GetFrameTheme(PaintState paint_state) const;
166 166
167 // Make settings button visible if either of the conditions is met: 167 // Make settings button visible if either of the conditions is met:
168 // 1) The panel is active, i.e. having focus. 168 // 1) The panel is active, i.e. having focus.
169 // 2) The mouse is over the panel. 169 // 2) The mouse is over the panel.
170 void UpdateSettingsButtonVisibility(bool active, bool cursor_in_view); 170 void UpdateSettingsButtonVisibility(bool active, bool cursor_in_view);
171 171
172 const Extension* GetExtension() const; 172 const Extension* GetExtension() const;
173 173
174 void EnsureSettingsMenuCreated(); 174 bool EnsureSettingsMenuCreated();
175 175
176 #ifdef UNIT_TEST 176 #ifdef UNIT_TEST
177 void set_mouse_watcher(MouseWatcher* mouse_watcher) { 177 void set_mouse_watcher(MouseWatcher* mouse_watcher) {
178 mouse_watcher_.reset(mouse_watcher); 178 mouse_watcher_.reset(mouse_watcher);
179 } 179 }
180 #endif 180 #endif
181 181
182 // The frame that hosts this view. This is a weak reference such that frame_ 182 // The frame that hosts this view. This is a weak reference such that frame_
183 // will always be valid in the lifetime of this view. 183 // will always be valid in the lifetime of this view.
184 BrowserFrame* frame_; 184 BrowserFrame* frame_;
(...skipping 15 matching lines...) Expand all
200 views::MenuModelAdapter settings_menu_adapter_; 200 views::MenuModelAdapter settings_menu_adapter_;
201 // Owned by |settings_menu_runner_|. 201 // Owned by |settings_menu_runner_|.
202 views::MenuItemView* settings_menu_; 202 views::MenuItemView* settings_menu_;
203 views::MenuRunner settings_menu_runner_; 203 views::MenuRunner settings_menu_runner_;
204 scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_; 204 scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
205 205
206 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView); 206 DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);
207 }; 207 };
208 208
209 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_ 209 #endif // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698