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

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

Issue 8479042: UI polish for certificate viewer (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk
Patch Set: Edit comments. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 13 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
14 #include "chrome/browser/chromeos/cros/cros_library.h" 14 #include "chrome/browser/chromeos/cros/cros_library.h"
15 #include "chrome/browser/chromeos/mobile_config.h" 15 #include "chrome/browser/chromeos/mobile_config.h"
16 #include "chrome/browser/chromeos/options/network_config_view.h" 16 #include "chrome/browser/chromeos/options/network_config_view.h"
17 #include "chrome/browser/chromeos/sim_dialog_delegate.h" 17 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
18 #include "chrome/browser/chromeos/status/network_menu_icon.h" 18 #include "chrome/browser/chromeos/status/network_menu_icon.h"
19 #include "chrome/browser/defaults.h" 19 #include "chrome/browser/defaults.h"
20 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_list.h" 21 #include "chrome/browser/ui/browser_list.h"
22 #include "chrome/browser/ui/dialog_style.h"
22 #include "chrome/browser/ui/views/window.h" 23 #include "chrome/browser/ui/views/window.h"
23 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
25 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
26 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
28 #include "net/base/escape.h" 29 #include "net/base/escape.h"
29 #include "third_party/skia/include/core/SkBitmap.h" 30 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/models/menu_model.h" 32 #include "ui/base/models/menu_model.h"
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 } 475 }
475 476
476 void NetworkMenuModel::SetMenuModelDelegate(ui::MenuModelDelegate* delegate) { 477 void NetworkMenuModel::SetMenuModelDelegate(ui::MenuModelDelegate* delegate) {
477 } 478 }
478 479
479 //////////////////////////////////////////////////////////////////////////////// 480 ////////////////////////////////////////////////////////////////////////////////
480 // NetworkMenuModel, private methods: 481 // NetworkMenuModel, private methods:
481 482
482 void NetworkMenuModel::ShowNetworkConfigView(NetworkConfigView* view) const { 483 void NetworkMenuModel::ShowNetworkConfigView(NetworkConfigView* view) const {
483 views::Widget* window = browser::CreateViewsWindow( 484 views::Widget* window = browser::CreateViewsWindow(
484 owner_->delegate()->GetNativeWindow(), view); 485 owner_->delegate()->GetNativeWindow(), view, STYLE_GENERIC);
485 window->SetAlwaysOnTop(true); 486 window->SetAlwaysOnTop(true);
486 window->Show(); 487 window->Show();
487 } 488 }
488 489
489 void NetworkMenuModel::ActivateCellular(const CellularNetwork* cellular) const { 490 void NetworkMenuModel::ActivateCellular(const CellularNetwork* cellular) const {
490 DCHECK(cellular); 491 DCHECK(cellular);
491 Browser* browser = BrowserList::GetLastActive(); 492 Browser* browser = BrowserList::GetLastActive();
492 if (!browser) 493 if (!browser)
493 return; 494 return;
494 browser->OpenMobilePlanTabAndActivate(); 495 browser->OpenMobilePlanTabAndActivate();
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 std::string page = StringPrintf( 1054 std::string page = StringPrintf(
1054 "%s?servicePath=%s&networkType=%d&networkName=%s", 1055 "%s?servicePath=%s&networkType=%d&networkName=%s",
1055 chrome::kInternetOptionsSubPage, 1056 chrome::kInternetOptionsSubPage,
1056 net::EscapeUrlEncodedData(network->service_path(), true).c_str(), 1057 net::EscapeUrlEncodedData(network->service_path(), true).c_str(),
1057 network->type(), 1058 network->type(),
1058 net::EscapeUrlEncodedData(network_name, false).c_str()); 1059 net::EscapeUrlEncodedData(network_name, false).c_str());
1059 browser->ShowOptionsTab(page); 1060 browser->ShowOptionsTab(page);
1060 } 1061 }
1061 1062
1062 } // namespace chromeos 1063 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/network_login_observer.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698