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

Side by Side Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 11779019: browser: Move FindTabbedBrowser() function into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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/options/network_config_view.h" 5 #include "chrome/browser/chromeos/options/network_config_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 20 matching lines...) Expand all
31 #include "ui/views/layout/grid_layout.h" 31 #include "ui/views/layout/grid_layout.h"
32 #include "ui/views/layout/layout_constants.h" 32 #include "ui/views/layout/layout_constants.h"
33 #include "ui/views/widget/widget.h" 33 #include "ui/views/widget/widget.h"
34 34
35 namespace { 35 namespace {
36 36
37 gfx::NativeWindow GetDialogParent() { 37 gfx::NativeWindow GetDialogParent() {
38 if (chromeos::BaseLoginDisplayHost::default_host()) { 38 if (chromeos::BaseLoginDisplayHost::default_host()) {
39 return chromeos::BaseLoginDisplayHost::default_host()->GetNativeWindow(); 39 return chromeos::BaseLoginDisplayHost::default_host()->GetNativeWindow();
40 } else { 40 } else {
41 Browser* browser = browser::FindTabbedBrowser( 41 Browser* browser = chrome::FindTabbedBrowser(
42 ProfileManager::GetDefaultProfileOrOffTheRecord(), 42 ProfileManager::GetDefaultProfileOrOffTheRecord(),
43 true, 43 true,
44 chrome::HOST_DESKTOP_TYPE_ASH); 44 chrome::HOST_DESKTOP_TYPE_ASH);
45 if (browser) 45 if (browser)
46 return browser->window()->GetNativeWindow(); 46 return browser->window()->GetNativeWindow();
47 } 47 }
48 return NULL; 48 return NULL;
49 } 49 }
50 50
51 // Avoid global static initializer. 51 // Avoid global static initializer.
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 image_view_ = new views::ImageView(); 316 image_view_ = new views::ImageView();
317 // Disable |image_view_| so mouse events propagate to the parent. 317 // Disable |image_view_| so mouse events propagate to the parent.
318 image_view_->SetEnabled(false); 318 image_view_->SetEnabled(false);
319 image_view_->SetImage(gray_image_); 319 image_view_->SetImage(gray_image_);
320 image_view_->SetTooltipText( 320 image_view_->SetTooltipText(
321 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY)); 321 l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
322 AddChildView(image_view_); 322 AddChildView(image_view_);
323 } 323 }
324 324
325 } // namespace chromeos 325 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/locale_change_guard.cc ('k') | chrome/browser/extensions/api/tabs/tabs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698