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

Side by Side Diff: chrome/browser/views/frame/browser_view.h

Issue 204022: ExtensionShelf now uses the BookmarkExtensionBackground, just like the Bookma... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 // Retrieves the command id for the specified Windows app command. 399 // Retrieves the command id for the specified Windows app command.
400 int GetCommandIDForAppCommandID(int app_command_id) const; 400 int GetCommandIDForAppCommandID(int app_command_id) const;
401 401
402 // Callback for the loading animation(s) associated with this view. 402 // Callback for the loading animation(s) associated with this view.
403 void LoadingAnimationCallback(); 403 void LoadingAnimationCallback();
404 404
405 // Initialize the hung plugin detector. 405 // Initialize the hung plugin detector.
406 void InitHangMonitor(); 406 void InitHangMonitor();
407 407
408 // Returns true if extensions and bookmarks are positioned next to each other.
409 bool ShowExtensionsOnTop();
410
411 // Initialize class statics. 408 // Initialize class statics.
412 static void InitClass(); 409 static void InitClass();
413 410
414 // The BrowserFrame that hosts this view. 411 // The BrowserFrame that hosts this view.
415 BrowserFrame* frame_; 412 BrowserFrame* frame_;
416 413
417 // The Browser object we are associated with. 414 // The Browser object we are associated with.
418 scoped_ptr<Browser> browser_; 415 scoped_ptr<Browser> browser_;
419 416
420 // Tool/Info bars that we are currently showing. Used for layout. 417 // Tool/Info bars that we are currently showing. Used for layout.
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 typedef std::set<BrowserBubble*> BubbleSet; 506 typedef std::set<BrowserBubble*> BubbleSet;
510 BubbleSet browser_bubbles_; 507 BubbleSet browser_bubbles_;
511 508
512 // The accessible name of this view. 509 // The accessible name of this view.
513 std::wstring accessible_name_; 510 std::wstring accessible_name_;
514 511
515 DISALLOW_COPY_AND_ASSIGN(BrowserView); 512 DISALLOW_COPY_AND_ASSIGN(BrowserView);
516 }; 513 };
517 514
518 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 515 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/views/extensions/extension_shelf.cc ('k') | chrome/browser/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698