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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 10539086: Add high-DPI resources for networks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test. Created 8 years, 6 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/chromeos/status/network_menu.h" 5 #include "chrome/browser/chromeos/status/network_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/chromeos/status/network_menu_icon.h" 23 #include "chrome/browser/chromeos/status/network_menu_icon.h"
24 #include "chrome/browser/defaults.h" 24 #include "chrome/browser/defaults.h"
25 #include "chrome/browser/profiles/profile_manager.h" 25 #include "chrome/browser/profiles/profile_manager.h"
26 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
27 #include "chrome/browser/ui/browser_finder.h" 27 #include "chrome/browser/ui/browser_finder.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
33 #include "grit/theme_resources_standard.h"
33 #include "net/base/escape.h" 34 #include "net/base/escape.h"
34 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/models/menu_model.h" 36 #include "ui/base/models/menu_model.h"
36 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
37 #include "ui/gfx/canvas.h" 38 #include "ui/gfx/canvas.h"
38 #include "ui/gfx/image/image_skia.h" 39 #include "ui/gfx/image/image_skia.h"
39 #include "ui/gfx/skbitmap_operations.h" 40 #include "ui/gfx/skbitmap_operations.h"
40 #include "ui/views/controls/menu/menu_item_view.h" 41 #include "ui/views/controls/menu/menu_item_view.h"
41 #include "ui/views/controls/menu/menu_model_adapter.h" 42 #include "ui/views/controls/menu/menu_model_adapter.h"
42 #include "ui/views/controls/menu/menu_runner.h" 43 #include "ui/views/controls/menu/menu_runner.h"
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 return ::ShouldHighlightNetwork(network); 1160 return ::ShouldHighlightNetwork(network);
1160 } 1161 }
1161 1162
1162 Browser* NetworkMenu::GetAppropriateBrowser() const { 1163 Browser* NetworkMenu::GetAppropriateBrowser() const {
1163 DCHECK(chromeos::UserManager::Get()->IsSessionStarted()); 1164 DCHECK(chromeos::UserManager::Get()->IsSessionStarted());
1164 return browser::FindOrCreateTabbedBrowser( 1165 return browser::FindOrCreateTabbedBrowser(
1165 ProfileManager::GetDefaultProfileOrOffTheRecord()); 1166 ProfileManager::GetDefaultProfileOrOffTheRecord());
1166 } 1167 }
1167 1168
1168 } // namespace chromeos 1169 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources_touch_2x.grd ('k') | chrome/browser/chromeos/status/network_menu_icon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698