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

Side by Side Diff: chrome/browser/views/old_frames/vista_frame.h

Issue 7155: Fix bug where a shelf or infobar would not be closed correctly when closing a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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/views/old_frames/vista_frame.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_VIEWS_OLD_FRAMES_VISTA_FRAME_H__ 5 #ifndef CHROME_BROWSER_VIEWS_OLD_FRAMES_VISTA_FRAME_H__
6 #define CHROME_BROWSER_VIEWS_OLD_FRAMES_VISTA_FRAME_H__ 6 #define CHROME_BROWSER_VIEWS_OLD_FRAMES_VISTA_FRAME_H__
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <atlbase.h> 9 #include <atlbase.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 // A view positioned beneath the bookmark bar view. 374 // A view positioned beneath the bookmark bar view.
375 // Implementation mirrors shelf_view_ 375 // Implementation mirrors shelf_view_
376 ChromeViews::View* info_bar_view_; 376 ChromeViews::View* info_bar_view_;
377 377
378 // We need to own the text of the menu, the Windows API does not copy it. 378 // We need to own the text of the menu, the Windows API does not copy it.
379 std::wstring task_manager_label_text_; 379 std::wstring task_manager_label_text_;
380 380
381 // A mapping between accelerators and commands. 381 // A mapping between accelerators and commands.
382 scoped_ptr<std::map<ChromeViews::Accelerator, int>> accelerator_table_; 382 scoped_ptr<std::map<ChromeViews::Accelerator, int>> accelerator_table_;
383 383
384 // Whether this frame needs a layout or not.
385 bool needs_layout_;
386
384 // Whether this frame represents an off the record session. 387 // Whether this frame represents an off the record session.
385 bool is_off_the_record_; 388 bool is_off_the_record_;
386 389
387 // Static resources 390 // Static resources
388 static bool g_initialized; 391 static bool g_initialized;
389 static SkBitmap** g_bitmaps; 392 static SkBitmap** g_bitmaps;
390 393
391 // Instance of accessibility information and handling for MSAA root 394 // Instance of accessibility information and handling for MSAA root
392 CComPtr<IAccessible> accessibility_root_; 395 CComPtr<IAccessible> accessibility_root_;
393 396
(...skipping 11 matching lines...) Expand all
405 // like unconstrained popups. Defaults to true. 408 // like unconstrained popups. Defaults to true.
406 bool should_save_window_placement_; 409 bool should_save_window_placement_;
407 410
408 // A view that holds the client-area contents of the browser window. 411 // A view that holds the client-area contents of the browser window.
409 BrowserView* browser_view_; 412 BrowserView* browser_view_;
410 413
411 DISALLOW_EVIL_CONSTRUCTORS(VistaFrame); 414 DISALLOW_EVIL_CONSTRUCTORS(VistaFrame);
412 }; 415 };
413 #endif // CHROME_BROWSER_VIEWS_OLD_FRAMES_VISTA_FRAME_H__ 416 #endif // CHROME_BROWSER_VIEWS_OLD_FRAMES_VISTA_FRAME_H__
414 417
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/views/old_frames/vista_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698