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

Side by Side Diff: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

Issue 12813004: Chromium style checker cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 9 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) 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 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h" 5 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/views/constrained_window_views.h" 8 #include "chrome/browser/ui/views/constrained_window_views.h"
9 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" 9 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 22 matching lines...) Expand all
33 const SkColor kDeemphasizedTextColor = SkColorSetRGB(159, 159, 159); 33 const SkColor kDeemphasizedTextColor = SkColorSetRGB(159, 159, 159);
34 34
35 const int kScrollAreaHeight = 192; 35 const int kScrollAreaHeight = 192;
36 36
37 // This container has the right Layout() impl to use within a ScrollView. 37 // This container has the right Layout() impl to use within a ScrollView.
38 class ScrollableView : public views::View { 38 class ScrollableView : public views::View {
39 public: 39 public:
40 ScrollableView() {} 40 ScrollableView() {}
41 virtual ~ScrollableView() {} 41 virtual ~ScrollableView() {}
42 42
43 void Layout() OVERRIDE; 43 virtual void Layout() OVERRIDE;
44 44
45 private: 45 private:
46 DISALLOW_COPY_AND_ASSIGN(ScrollableView); 46 DISALLOW_COPY_AND_ASSIGN(ScrollableView);
47 }; 47 };
48 48
49 void ScrollableView::Layout() { 49 void ScrollableView::Layout() {
50 gfx::Size pref = GetPreferredSize(); 50 gfx::Size pref = GetPreferredSize();
51 int width = pref.width(); 51 int width = pref.width();
52 int height = pref.height(); 52 int height = pref.height();
53 if (parent()) { 53 if (parent()) {
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 382
383 // MediaGalleriesDialogViewsController ----------------------------------------- 383 // MediaGalleriesDialogViewsController -----------------------------------------
384 384
385 // static 385 // static
386 MediaGalleriesDialog* MediaGalleriesDialog::Create( 386 MediaGalleriesDialog* MediaGalleriesDialog::Create(
387 MediaGalleriesDialogController* controller) { 387 MediaGalleriesDialogController* controller) {
388 return new MediaGalleriesDialogViews(controller); 388 return new MediaGalleriesDialogViews(controller);
389 } 389 }
390 390
391 } // namespace chrome 391 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698