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

Side by Side Diff: chrome/views/chrome_menu.cc

Issue 7995: Move Time, TimeDelta and TimeTicks into namespace base. (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
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 #include "chrome/views/chrome_menu.h" 5 #include "chrome/views/chrome_menu.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <uxtheme.h> 8 #include <uxtheme.h>
9 #include <Vssym32.h> 9 #include <Vssym32.h>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "chrome/common/l10n_util.h" 21 #include "chrome/common/l10n_util.h"
22 #include "chrome/common/os_exchange_data.h" 22 #include "chrome/common/os_exchange_data.h"
23 #include "chrome/views/border.h" 23 #include "chrome/views/border.h"
24 #include "chrome/views/container_win.h" 24 #include "chrome/views/container_win.h"
25 #include "chrome/views/root_view.h" 25 #include "chrome/views/root_view.h"
26 #include "generated_resources.h" 26 #include "generated_resources.h"
27 27
28 #undef min 28 #undef min
29 #undef max 29 #undef max
30 30
31 using base::Time;
32 using base::TimeDelta;
33
31 // Margins between the top of the item and the label. 34 // Margins between the top of the item and the label.
32 static const int kItemTopMargin = 3; 35 static const int kItemTopMargin = 3;
33 36
34 // Margins between the bottom of the item and the label. 37 // Margins between the bottom of the item and the label.
35 static const int kItemBottomMargin = 4; 38 static const int kItemBottomMargin = 4;
36 39
37 // Margins between the left of the item and the icon. 40 // Margins between the left of the item and the icon.
38 static const int kItemLeftMargin = 4; 41 static const int kItemLeftMargin = 4;
39 42
40 // Padding between the label and submenu arrow. 43 // Padding between the label and submenu arrow.
(...skipping 2672 matching lines...) Expand 10 before | Expand all | Expand 10 after
2713 if (!scroll_task_.get()) 2716 if (!scroll_task_.get())
2714 scroll_task_.reset(new MenuScrollTask()); 2717 scroll_task_.reset(new MenuScrollTask());
2715 scroll_task_->Update(part); 2718 scroll_task_->Update(part);
2716 } 2719 }
2717 2720
2718 void MenuController::StopScrolling() { 2721 void MenuController::StopScrolling() {
2719 scroll_task_.reset(NULL); 2722 scroll_task_.reset(NULL);
2720 } 2723 }
2721 2724
2722 } // namespace views 2725 } // namespace views
2723
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698