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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_action_button.mm

Issue 1543393002: Switch to standard integer types in chrome/browser/ui/cocoa/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 5 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
16 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" 17 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
17 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 18 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
18 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 19 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
19 #import "chrome/browser/ui/cocoa/themed_window.h" 20 #import "chrome/browser/ui/cocoa/themed_window.h"
20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 21 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window { 570 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
570 const ui::ThemeProvider* themeProvider = [window themeProvider]; 571 const ui::ThemeProvider* themeProvider = [window themeProvider];
571 if (!themeProvider) 572 if (!themeProvider)
572 themeProvider = 573 themeProvider =
573 [[browserActionsController_ browser]->window()->GetNativeWindow() 574 [[browserActionsController_ browser]->window()->GetNativeWindow()
574 themeProvider]; 575 themeProvider];
575 return themeProvider; 576 return themeProvider;
576 } 577 }
577 578
578 @end 579 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698